Fixing install.

diff --git a/build/ubuntu/changelog b/build/ubuntu/changelog
index 1d85b7d..ebb09dd 100644 (file)
--- a/build/ubuntu/changelog
+++ b/build/ubuntu/changelog
@@ -1,4 +1,4 @@
-ananas (0.9.5-1) unstable; urgency=low
+ananas4 (0.9.5-1) unstable; urgency=low
 
   * Initial release of debian package
   * Новое расширение для прямой работы с SQL сервером. Предназначено для 

diff --git a/build/ubuntu/control b/build/ubuntu/control
index 6d12e39..5626f99 100644 (file)
--- a/build/ubuntu/control
+++ b/build/ubuntu/control
@@ -1,11 +1,11 @@
-Source: ananas
+Source: ananas4
 Section: Office
 Priority: optional
-Maintainer: Ananas Project Package Key (ananasproject) <ananasproject@googlegroups.com>
+Maintainer: Andrey Paskal (app) <apaskal@gmail.com>
 Build-Depends: debhelper (>= 5), qt4-dev-tools, libqt4-dev, libmysqlclient-dev, libqsa1-qt4-dev, libqt4-qdataschema
 Standards-Version: 3.7.2
 
-Package: ananas
+Package: ananas4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, zip, unzip, libqtgui4, mysql-client (>=4.1), mysql-server (>=4.1), libqsa1-qt4, libqt4-qdataschema
 Description: Runtime and development environment of Finance Applications

diff --git a/build/ubuntu/postinst b/build/ubuntu/postinst
index b6c1766..5a99f31 100644 (file)
--- a/build/ubuntu/postinst
+++ b/build/ubuntu/postinst
@@ -32,7 +32,7 @@ case "$1" in
        #creates system base for mysql
 #      mysqlshow -u root| grep ananas_system > /dev/null || mysqladmin -u root create ananas_system || :
 
-       ln -fs  /usr/lib/ananas/qt4plugins/designer/libananasplugin.so /usr/lib/libananasplugin.so
+       ln -fs /usr/lib/libananasplugin.so /usr/lib/ananas/qt4plugins/designer/libananasplugin.so
 #      chmod 666 /etc/ananas/* || :
 #      chmod 777 /etc/ananas
     ;;

diff --git a/src/admin/admin.pro b/src/admin/admin.pro
index 6470962..8314b08 100644 (file)
--- a/src/admin/admin.pro
+++ b/src/admin/admin.pro
@@ -59,12 +59,12 @@ TRANSLATIONS = \
 
 
 unix {
-        aadmin.path = $(BINDIR)
-        aadmin.files = ananas4-administrator
+        target.path = $(BINDIR)
+#        aadmin.files = ananas4-administrator
 #        aadmin.extra = cp -df ananas4-administrator $(INSTALL_ROOT)$(BINDIR)
      }
 
-INSTALLS += aadmin
+INSTALLS += target
 
 
 

diff --git a/src/ananas/ananas.pro b/src/ananas/ananas.pro
index 612e70c..d8e36b4 100644 (file)
--- a/src/ananas/ananas.pro
+++ b/src/ananas/ananas.pro
@@ -35,12 +35,13 @@ TRANSLATIONS = \
     ../../translations/ananas-engine-ru.ts 
     
 unix {
-    ananas.path = $(BINDIR)
-    ananas.files = ananas4
+    target.path = $(BINDIR)
+#    ananas.files = ananas4
 }
 win32{
 #    ananas.path =.
 #    ananas.extra = CALL create_base.bat
 }    
 
-INSTALLS += ananas
+INSTALLS += target
+

diff --git a/src/designer/designer.pro b/src/designer/designer.pro
index f1dd5b3..1c6a267 100644 (file)
--- a/src/designer/designer.pro
+++ b/src/designer/designer.pro
@@ -172,11 +172,12 @@ TRANSLATIONS = \
     ../../translations/ananas-designer-ru.ts 
 
 unix {
-       adesigner.path = $(BINDIR)
-       adesigner.files = ananas-designer
+       target.path = $(BINDIR)
+#      adesigner.files = ananas-designer
 #      acfg.path = /etc/ananas
 #      acfg.files= testwrite.cfg
      } 
 
-INSTALLS += adesigner
+INSTALLS += target
+
 

diff --git a/src/extensions/aextsql/aextsql.pro b/src/extensions/aextsql/aextsql.pro
index 97989ca..a79f29b 100644 (file)
--- a/src/extensions/aextsql/aextsql.pro
+++ b/src/extensions/aextsql/aextsql.pro
@@ -24,7 +24,7 @@ win32:DESTDIR = ..
 #win32:DLLDESTDIR      = ..
 
 unix{
-       libext.path = $(LIBDIR)/ananas 
-       libext.files = libaextsql.so
-       INSTALLS += libext
+       target.path = $(LIBDIR)/ananas 
+#      libext.files = libaextsql.so
+       INSTALLS += target
 }

diff --git a/src/extensions/meta/meta.pro b/src/extensions/meta/meta.pro
index 16005e4..92049e1 100644 (file)
--- a/src/extensions/meta/meta.pro
+++ b/src/extensions/meta/meta.pro
@@ -16,8 +16,8 @@ LANGUAGE      = C++
 win32:DESTDIR = ..
 
 unix{
-        libmeta.path = $(LIBDIR)/ananas
-        libmeta.files = libaext_meta.so
+        target.path = $(LIBDIR)/ananas
+#        libmeta.files = libaext_meta.so
         INSTALLS += libmeta
 }
 

diff --git a/src/extensions/service/service.pro b/src/extensions/service/service.pro
index 0d2672b..11233f2 100644 (file)
--- a/src/extensions/service/service.pro
+++ b/src/extensions/service/service.pro
@@ -22,8 +22,8 @@ LANGUAGE      = C++
 win32:DESTDIR = ..
 
 unix{
-       libext.path = $(LIBDIR)/ananas
-       libext.files = libaextservice.so
-        INSTALLS += libext
+       target.path = $(LIBDIR)/ananas
+#      libext.files = libaextservice.so
+        INSTALLS += target
 }
 

diff --git a/src/extensions/te/te.pro b/src/extensions/te/te.pro
index 9a41466..82f3d4a 100644 (file)
--- a/src/extensions/te/te.pro
+++ b/src/extensions/te/te.pro
@@ -26,8 +26,8 @@ win32 {
 win32:DESTDIR = ..
 
 unix{
-        libext.path = $(LIBDIR)/ananas
-        libext.files = libaextte.so
-        INSTALLS += libext
+        target.path = $(LIBDIR)/ananas
+#        libext.files = libaextte.so
+        INSTALLS += target
 }
 

diff --git a/src/extensions/text/text.pro b/src/extensions/text/text.pro
index 4434b81..6bff8e4 100644 (file)
--- a/src/extensions/text/text.pro
+++ b/src/extensions/text/text.pro
@@ -16,8 +16,8 @@ LANGUAGE      = C++
 win32:DESTDIR = ..
 
 unix{
-        libext.path = $(LIBDIR)/ananas
-        libext.files = libaexttext.so
-        INSTALLS += libext
+        target.path = $(LIBDIR)/ananas
+#        libext.files = libaexttext.so
+        INSTALLS += target
 }
 

diff --git a/src/extensions/xml/xml.pro b/src/extensions/xml/xml.pro
index 74760f4..1d0e8c0 100644 (file)
--- a/src/extensions/xml/xml.pro
+++ b/src/extensions/xml/xml.pro
@@ -22,8 +22,8 @@ LANGUAGE      = C++
 win32:DESTDIR = ..
 
 unix{
-        libext.path = $(LIBDIR)/ananas
-        libext.files = libaextxml.so
-        INSTALLS += libext
+        target.path = $(LIBDIR)/ananas
+#        libext.files = libaextxml.so
+        INSTALLS += target
 }
 

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 6a9b1d3..eb1a7ba 100644 (file)
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -101,9 +101,12 @@ TRANSLATIONS = \
     ../../translations/ananas-lib-ru.ts 
     
 unix{
-    alib.path = $(LIBDIR) 
-    alib.files = libananas4.so.$$VERSION
-    alib.extra = cp -df $(DESTDIR)/libananas4.so* $(INSTALL_ROOT)$(LIBDIR)
+    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.files = $$HEADERS
@@ -117,10 +120,11 @@ win32 {
 #    alibheader.path = $(INCLUDEDIR)
 #    alibheader.files = $$HEADERS
 #    alibheader.files += tmp\ui\*h
-      }
+    INSTALLS += alib
+}
 
-INSTALLS += alib
 unix{
+    INSTALLS += target
     INSTALLS += alibheader
 }
 

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 4326851..3cc68bd 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -52,22 +52,23 @@ TRANSLATIONS = \
 
 #SLASH = /
 unix {
-    lplugin.path = $(QTDIR)/plugins/designer
-    lplugin.files = libananasplugin4.so
-    lplugin.extra = cp -f $(DESTDIR)/libananasplugin4.so $(INSTALL_ROOT)$(LIBDIR) || true
+    target.path = $(QTDIR)/plugins/designer
+#    lplugin.files = libananasplugin4.so
+#    lplugin.extra = cp -f $(DESTDIR)/libananasplugin4.so $(INSTALL_ROOT)$(LIBDIR) || true
     lpluginheader.path = $(INCLUDEDIR)
     lpluginheader.files = $$HEADERS
 }  
 
 win32 {
-    target.path = $(QTDIR)\plugins\designer
+#   target.path = $(QTDIR)\plugins\designer
     lplugin.path = $(QTDIR)\plugins\designer
     lplugin.files = ananasplugin4.*
     lplugin.extra = copy ananasplugin4.* $(QTDIR)\lib
+    INSTALLS += lplugin 
 }  
 
-INSTALLS += lplugin 
 unix{
+    INSTALLS +=target  
     INSTALLS += lpluginheader
 }