make zip lib static, otherwise it collides with the other libzip.so

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@325 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33

diff --git a/debian/rules b/debian/rules
index bee3a9c..f7180fc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,11 +69,11 @@ install-client:
        @echo Install Client...
        mkdir -p $(CLIENT)/usr/share/doc/magicsmoke2-client
        install -D src/msmoke $(CLIENT)/usr/lib/magicsmoke2/msmoke
-       cp zip/lib* $(CLIENT)/usr/lib/magicsmoke2/
+       #cp zip/lib* $(CLIENT)/usr/lib/magicsmoke2/
        cp src/icon.png $(CLIENT)/usr/lib/magicsmoke2/
        echo '#!/bin/sh' >$(CLIENT)/usr/bin/msmoke2
-       echo 'LD_LIBRARY_PATH=/usr/lib/magicsmoke2:$LD_LIBRARY_PATH' >>$(CLIENT)/usr/bin/msmoke2
-       echo 'export LD_LIBRARY_PATH' >>$(CLIENT)/usr/bin/msmoke2
+       #echo 'LD_LIBRARY_PATH=/usr/lib/magicsmoke2:$LD_LIBRARY_PATH' >>$(CLIENT)/usr/bin/msmoke2
+       #echo 'export LD_LIBRARY_PATH' >>$(CLIENT)/usr/bin/msmoke2
        echo 'exec /usr/lib/magicsmoke2/msmoke' >>$(CLIENT)/usr/bin/msmoke2
        chmod +x $(CLIENT)/usr/bin/msmoke2
        rm -rf `find $(CLIENT) -name .svn`

diff --git a/zip/zip.pro b/zip/zip.pro
index a3ee791..842516b 100644 (file)
--- a/zip/zip.pro
+++ b/zip/zip.pro
@@ -30,6 +30,7 @@
 TEMPLATE = lib
 TARGET = zip
 DESTDIR = ../zip
+CONFIG += release staticlib
 
 SOURCES += \
                ioapi.c \