improving install scripts

diff --git a/build/ubuntu/postinst b/build/ubuntu/postinst
index 7f4912a..ecb17fd 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/ananas4/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/prerm b/build/ubuntu/prerm
index 5bcbd8c..edcde57 100644 (file)
--- a/build/ubuntu/prerm
+++ b/build/ubuntu/prerm
@@ -19,8 +19,8 @@ set -e
 
 case "$1" in
     remove)
-       rm -f /usr/share/ananas/translations/*.qm
-       rm -f /usr/share/ananas/templates/*.*
+#      rm -f /usr/share/ananas/translations/*.qm
+#      rm -f /usr/share/ananas/templates/*.*
 #      rm -f /usr/share/ananas/inventory/templ_*.odt
 #      rm -f /usr/share/ananas/inventory/templ_*.ods
 #      rm -f /etc/ananas/inventory.*

diff --git a/build/ubuntu/rules b/build/ubuntu/rules
index c7a73ee..7b501a1 100755 (executable)
--- a/build/ubuntu/rules
+++ b/build/ubuntu/rules
@@ -57,23 +57,21 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/ananas.
-#      rm -f `find src doc -name Makefile`
-#      qmake src/src.pro -o src/Makefile
-
-       mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/translations
-       mkdir -p $(CURDIR)/debian/ananas/usr/share/ananas/templates
-       mkdir -p $(CURDIR)/debian/ananas/usr/share/applications
-       mkdir -p $(CURDIR)/debian/ananas/usr/share/pixmaps
-       mkdir -p $(CURDIR)/debian/ananas/usr/lib/menu
+
+       mkdir -p $(CURDIR)/debian/ananas4/usr/share/ananas4/translations
+       mkdir -p $(CURDIR)/debian/ananas4/usr/share/ananas4/templates
+       mkdir -p $(CURDIR)/debian/ananas4/usr/share/applications
+       mkdir -p $(CURDIR)/debian/ananas4/usr/share/pixmaps
+       mkdir -p $(CURDIR)/debian/ananas4/usr/lib/menu
        cd src && \
        $(MAKE) install \
-       INSTALL_ROOT=$(CURDIR)/debian/ananas LIBDIR=/usr/lib \
-       BINDIR=/usr/bin INCLUDEDIR=/usr/include/ananas 
+       INSTALL_ROOT=$(CURDIR)/debian/ananas4 LIBDIR=/usr/lib \
+       BINDIR=/usr/bin INCLUDEDIR=/usr/include/ananas4 
        #cd ../doc && qmake doc.pro -o Makefile && make install INSTALL_ROOT=$(CURDIR)/debian/ananas \
        #DOCDIR=$(CURDIR)/debian/ananas/usr/share/doc/ananas
 
-       cp -f ./translations/*.qm $(CURDIR)/debian/ananas/usr/share/ananas/translations
-       cp -f ./src/designer/templates/*.* $(CURDIR)/debian/ananas/usr/share/ananas/templates
+       cp -f ./translations/*.qm $(CURDIR)/debian/ananas4/usr/share/ananas4/translations
+       cp -f ./src/designer/templates/*.* $(CURDIR)/debian/ananas4/usr/share/ananas4/templates
 
 
        # clear debug info
@@ -84,9 +82,9 @@ install: build
 #      strip $(CURDIR)/debian/$(package)/usr/lib/ananas/qt4plugins/sqldrivers/libqsqlmysqlu.so
        
 
-       cp -f ./build/menus/kde/ananas.desktop $(CURDIR)/debian/ananas/usr/share/applications/
-       cp -f ./build/menus/kde/ananas-designer.desktop $(CURDIR)/debian/ananas/usr/share/applications/
-       cp -f ./build/icons/*.png $(CURDIR)/debian/ananas/usr/share/pixmaps/
+       cp -f ./build/menus/kde/ananas.desktop $(CURDIR)/debian/ananas4/usr/share/applications/
+       cp -f ./build/menus/kde/ananas-designer.desktop $(CURDIR)/debian/ananas4/usr/share/applications/
+       cp -f ./build/icons/*.png $(CURDIR)/debian/ananas4/usr/share/pixmaps/
 
        # inventory
 #      mkdir -p $(CURDIR)/debian/ananas/etc/ananas
@@ -101,8 +99,9 @@ install: build
 #      cp -f ./applications/inventory/templ_*.odt $(CURDIR)/debian/ananas/usr/share/ananas/inventory/
 #      cp -f ./applications/inventory/templ_*.ods $(CURDIR)/debian/ananas/usr/share/ananas/inventory/
 
-       rm -Rf $(CURDIR)/debian/ananas/usr/include/ananas || :
-       rm -f $(CURDIR)/debian/ananas/usr/share/doc/ananas/*.tex || :
+#      rm -Rf $(CURDIR)/debian/ananas/usr/include/ananas || :
+#      rm -f $(CURDIR)/debian/ananas/usr/share/doc/ananas/*.tex || :
+       find $(CURDIR)/debian/ananas4/ || :
 
 # Build architecture-independent files here.
 binary-indep: build install