From 1233170583e4edf13ae100d4c091735c37da922d Mon Sep 17 00:00:00 2001 From: Andrey Paskal Date: Mon, 27 Apr 2009 17:59:59 +0400 Subject: [PATCH] Changed install instructions --- src/admin/admin.pro | 12 ++++++++++++ src/ananas/ananas.pro | 2 +- src/designer/designer.pro | 2 +- src/extensions/meta/meta.pro | 9 ++++++++- src/extensions/te/te.pro | 10 ++++++++-- src/extensions/text/text.pro | 10 ++++++++-- src/extensions/xml/xml.pro | 10 ++++++++-- src/lib/lib.pro | 4 ++-- src/plugins/plugins.pro | 4 ++-- 9 files changed, 50 insertions(+), 13 deletions(-) diff --git a/src/admin/admin.pro b/src/admin/admin.pro index 6276148..a2d06e4 100644 --- a/src/admin/admin.pro +++ b/src/admin/admin.pro @@ -56,4 +56,16 @@ RESOURCES +=admin.qrc TRANSLATIONS = \ ../../translations/ananas-administrator-en.ts \ ../../translations/ananas-administrator-ru.ts + + +unix { + aadmin.path = $(BINDIR) + aadmin.files = ananas4-administrator + aadmin.extra = cp -df ananas4-administrator $(INSTALL_ROOT)$(BINDIR) + } + +INSTALLS += aadmin + + + diff --git a/src/ananas/ananas.pro b/src/ananas/ananas.pro index 0571384..612e70c 100644 --- a/src/ananas/ananas.pro +++ b/src/ananas/ananas.pro @@ -43,4 +43,4 @@ win32{ # ananas.extra = CALL create_base.bat } -#INSTALLS += ananas +INSTALLS += ananas diff --git a/src/designer/designer.pro b/src/designer/designer.pro index ca9006f..f1dd5b3 100644 --- a/src/designer/designer.pro +++ b/src/designer/designer.pro @@ -178,5 +178,5 @@ unix { # acfg.files= testwrite.cfg } -#INSTALLS += adesigner +INSTALLS += adesigner diff --git a/src/extensions/meta/meta.pro b/src/extensions/meta/meta.pro index 6a84db6..16005e4 100644 --- a/src/extensions/meta/meta.pro +++ b/src/extensions/meta/meta.pro @@ -13,4 +13,11 @@ LIBS += -L../../../lib -lananas4 CONFIG += plugin INCLUDEPATH += ../../lib LANGUAGE = C++ -DESTDIR = .. +win32:DESTDIR = .. + +unix{ + libmeta.path = $(LIBDIR)/ananas + libmeta.files = libaext_meta.so + INSTALLS += libmeta +} + diff --git a/src/extensions/te/te.pro b/src/extensions/te/te.pro index ffca994..9a41466 100644 --- a/src/extensions/te/te.pro +++ b/src/extensions/te/te.pro @@ -23,5 +23,11 @@ win32 { # LIBS += -L/src/tradeequip/lib -ltradeequip } -DESTDIR = .. -#win32:DLLDESTDIR = .. +win32:DESTDIR = .. + +unix{ + libext.path = $(LIBDIR)/ananas + libext.files = libaextte.so + INSTALLS += libext +} + diff --git a/src/extensions/text/text.pro b/src/extensions/text/text.pro index 6b017e3..4434b81 100644 --- a/src/extensions/text/text.pro +++ b/src/extensions/text/text.pro @@ -13,5 +13,11 @@ CONFIG += plugin LIBS += -L../../../lib -lananas4 INCLUDEPATH += ../../lib LANGUAGE = C++ -DESTDIR = .. -#win32:DLLDESTDIR = .. +win32:DESTDIR = .. + +unix{ + libext.path = $(LIBDIR)/ananas + libext.files = libaexttext.so + INSTALLS += libext +} + diff --git a/src/extensions/xml/xml.pro b/src/extensions/xml/xml.pro index 5048820..74760f4 100644 --- a/src/extensions/xml/xml.pro +++ b/src/extensions/xml/xml.pro @@ -19,5 +19,11 @@ INCLUDEPATH += ../../lib LIBS += -L../../../lib -lananas4 LANGUAGE = C++ -DESTDIR = .. -#win32:DLLDESTDIR = .. +win32:DESTDIR = .. + +unix{ + libext.path = $(LIBDIR)/ananas + libext.files = libaextxml.so + INSTALLS += libext +} + diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 209ff48..ae34c30 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -119,9 +119,9 @@ win32 { # alibheader.files += tmp\ui\*h } -#INSTALLS += alib +INSTALLS += alib unix{ -# INSTALLS += alibheader + INSTALLS += alibheader } include(metadata/metadata.pri) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 16b9581..7acab6a 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -66,9 +66,9 @@ win32 { lplugin.extra = copy ananasplugin4.* $(QTDIR)\lib } -#INSTALLS += lplugin +INSTALLS += lplugin unix{ -# INSTALLS += lpluginheader + INSTALLS += lpluginheader } include ( actionbutton/actionbutton.pri ) -- 1.7.1