From: Andrey Paskal Date: Sun, 27 Dec 2009 15:29:46 +0000 (+0300) Subject: Продолжаем бороться с qmake X-Git-Url: https://gitweb.ananas.su/?a=commitdiff_plain;h=d5c189473e4b2558ac8c35dec99e7c48c99f9f5e;p=projects%2Fananas-labs-qt4.git Продолжаем бороться с qmake --- diff --git a/src/admin/admin.pro b/src/admin/admin.pro index 040718c..dd15806 100644 --- a/src/admin/admin.pro +++ b/src/admin/admin.pro @@ -61,7 +61,7 @@ TRANSLATIONS = \ unix { - target.path = $(BINDIR) + target.path = /$(BINDIR) # aadmin.files = ananas4-administrator # aadmin.extra = cp -df ananas4-administrator $(INSTALL_ROOT)$(BINDIR) } diff --git a/src/ananas/ananas.pro b/src/ananas/ananas.pro index f7cbea4..7a466a6 100644 --- a/src/ananas/ananas.pro +++ b/src/ananas/ananas.pro @@ -38,7 +38,7 @@ TRANSLATIONS = \ ../../translations/ananas-engine-ru.ts unix { - target.path = $(BINDIR) + target.path = /$(BINDIR) # ananas.files = ananas4 } win32{ diff --git a/src/designer/designer.pro b/src/designer/designer.pro index 0bc54af..554a054 100644 --- a/src/designer/designer.pro +++ b/src/designer/designer.pro @@ -174,7 +174,7 @@ TRANSLATIONS = \ ../../translations/ananas-designer-ru.ts unix { - target.path = $$(BINDIR) + target.path = /$(BINDIR) # adesigner.files = ananas-designer # acfg.path = /etc/ananas # acfg.files= testwrite.cfg diff --git a/src/editor/editor.pro b/src/editor/editor.pro index 285c49a..74a30f5 100644 --- a/src/editor/editor.pro +++ b/src/editor/editor.pro @@ -3,3 +3,6 @@ TEMPLATE = lib TARGET = qtscriptedit #DEFINES += Q_SCRIPTDEBUG_BUILD_LIB include(editor.pri) +unix:VERSION = 1.0.0 +unix:target.path = /$(LIBDIR) +unix:INSTALLS += target diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 712a0df..92e2c45 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -54,10 +54,10 @@ TRANSLATIONS = \ #SLASH = / unix { - target.path = $(LIBDIR) + target.path = /$(LIBDIR) # lplugin.files = libananasplugin4.so # lplugin.extra = cp -f $(DESTDIR)/libananasplugin4.so $(INSTALL_ROOT)$(LIBDIR) || true - lpluginheader.path = $(INCLUDEDIR) + lpluginheader.path = /$(INCLUDEDIR) lpluginheader.files = $$HEADERS }