Working on install scripts.

diff --git a/build/ubuntu/postinst b/build/ubuntu/postinst
index 5a99f31..7f4912a 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/libananasplugin.so /usr/lib/ananas/qt4plugins/designer/libananasplugin.so
+       ln -fs /usr/lib/libananasplugin.so /usr/lib/ananas4/libananasplugin.so
 #      chmod 666 /etc/ananas/* || :
 #      chmod 777 /etc/ananas
     ;;

diff --git a/build/ubuntu/rules b/build/ubuntu/rules
index 8208198..c7a73ee 100755 (executable)
--- a/build/ubuntu/rules
+++ b/build/ubuntu/rules
@@ -24,14 +24,6 @@ configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
 
-       # ananas
-       
-       # Временная заглушка для откладки процесса сборки пакета
-       # Используем архив с ранее откомпилированным Ананасом, что бы ускорить процедуру сборки пакета
-       # Если вы не занимаетесь отладкой сборки пакета, а собираете Ананас, закоментируйте этот блок кода.
-
-#      cd .. && tar zxf /home/app/tmp/compiled/ananas-0.9.5.tgz --exclude debian
-       
        touch configure-stamp
 
 
@@ -112,8 +104,6 @@ install: build
        rm -Rf $(CURDIR)/debian/ananas/usr/include/ananas || :
        rm -f $(CURDIR)/debian/ananas/usr/share/doc/ananas/*.tex || :
 
-       # QSA
-#      cp /usr/share/qt4/lib/libqsa* $(CURDIR)/debian/ananas/usr/lib/
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

diff --git a/src/admin/admin.pro b/src/admin/admin.pro
index 8314b08..e087db0 100644 (file)
--- a/src/admin/admin.pro
+++ b/src/admin/admin.pro
@@ -59,7 +59,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 d8e36b4..7f95a4d 100644 (file)
--- a/src/ananas/ananas.pro
+++ b/src/ananas/ananas.pro
@@ -35,7 +35,7 @@ TRANSLATIONS = \
     ../../translations/ananas-engine-ru.ts 
     
 unix {
-    target.path = $(BINDIR)
+    target.path = $$(BINDIR)
 #    ananas.files = ananas4
 }
 win32{

diff --git a/src/ananas/main.cpp b/src/ananas/main.cpp
index c4fcdbd..1aefbe2 100644 (file)
--- a/src/ananas/main.cpp
+++ b/src/ananas/main.cpp
@@ -145,7 +145,7 @@ int main( int argc, char ** argv )
        qApp->addLibraryPath( qApp->applicationDirPath() );
 #else
        pixmap = QPixmap( "/usr/share/ananas/designer/locale/engine-splash-"+lang+".png" );
-       qApp->addLibraryPath( "/usr/lib/ananas/" );
+       qApp->addLibraryPath( "/usr/lib/ananas4" );
 #endif
        //--printf("extensions: \n%s\n",( const char *) AExtensionFactory::keys().join("\n") );
 // Test create extension

diff --git a/src/designer/designer.pro b/src/designer/designer.pro
index 1c6a267..66f8e8a 100644 (file)
--- a/src/designer/designer.pro
+++ b/src/designer/designer.pro
@@ -172,7 +172,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/extensions/aextsql/aextsql.pro b/src/extensions/aextsql/aextsql.pro
index a79f29b..3ae0156 100644 (file)
--- a/src/extensions/aextsql/aextsql.pro
+++ b/src/extensions/aextsql/aextsql.pro
@@ -24,7 +24,7 @@ win32:DESTDIR = ..
 #win32:DLLDESTDIR      = ..
 
 unix{
-       target.path = $(LIBDIR)/ananas 
+       target.path = $$(LIBDIR)/ananas4 
 #      libext.files = libaextsql.so
        INSTALLS += target
 }

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

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

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

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

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

diff --git a/src/lib/aextensionfactory.cpp b/src/lib/aextensionfactory.cpp
index 2b47765..9992629 100644 (file)
--- a/src/lib/aextensionfactory.cpp
+++ b/src/lib/aextensionfactory.cpp
@@ -59,7 +59,7 @@ AExtensionFactoryPrivate::AExtensionFactoryPrivate()
 #ifdef Q_OS_WIN32
     extensionsDirName = qApp->applicationDirPath()+"/extensions";
 #else
-    extensionsDirName = "/usr/lib/ananas4/extensions";
+    extensionsDirName = "/usr/lib/ananas4";
 #endif
 
     hash.clear();

diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index eb1a7ba..469bfef 100644 (file)
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -101,20 +101,20 @@ TRANSLATIONS = \
     ../../translations/ananas-lib-ru.ts 
     
 unix{
-    target.path = $(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.path = $$(INCLUDEDIR)
     alibheader.files = $$HEADERS
     alibheader.files += .ui/*h
     }
 
 win32 {
-    alib.path = $(QTDIR)\lib
+    alib.path = $$(QTDIR)\lib
     alib.files += ananas4.dll
     alib.files += ananas4.lib
 #    alibheader.path = $(INCLUDEDIR)

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 3cc68bd..f741003 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -52,10 +52,10 @@ TRANSLATIONS = \
 
 #SLASH = /
 unix {
-    target.path = $(QTDIR)/plugins/designer
+    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
 }