Fixing make install

diff --git a/src/admin/admin.pro b/src/admin/admin.pro
index 6af76ea..040718c 100644 (file)
--- 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 d30362b..f7cbea4 100644 (file)
--- 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/lib/lib.pro b/src/lib/lib.pro
index 4a68266..6a42545 100644 (file)
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -105,14 +105,14 @@ TRANSLATIONS = \
     ../../translations/ananas-lib-ru.ts 
     
 unix{
-    target.path = $$(LIBDIR) 
-    target.files = libananas4.so.$$VERSION
+    target.path = $(LIBDIR) 
+#    target.files = libananas4.so.$$VERSION
 #    target.extra = cp -df $(DESTDIR)/libananas4.so* $(INSTALL_ROOT)$(LIBDIR)
 #    alib.path = $(LIBDIR) 
 #    alib.files = libananas4.so.$$VERSION
 #    alib.extra = cp -df $(DESTDIR)/libananas4.so* $(INSTALL_ROOT)$(LIBDIR)
 
-    alibheader.path = $$(INCLUDEDIR)
+    alibheader.path = $(INCLUDEDIR)
     alibheader.files = $$HEADERS
     alibheader.files += .ui/*h
     }

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 7bd452d..712a0df 100644 (file)
--- 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
 }