Let libtool make our libraries because marc likes it that way

Don't mess with soname in rules; makefiles do that now
libzephyr3 -> libzephyr4

git-svn-id: svn://svn.1ts.org/debian/trunk@133 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/debian/libzephyr4.files b/zephyr/debian/libzephyr4.files
new file mode 100644 (file)
index 0000000..a837249
--- /dev/null
+++ b/zephyr/debian/libzephyr4.files
@@ -0,0 +1 @@
+usr/lib/libzephyr.so.*

diff --git a/zephyr/debian/rules b/zephyr/debian/rules
index 2caa1ff9090c611791a0c21d4e0b02f1e55d944d..0c2f43492d024d6232025fe66bac79efccd99b76 100755 (executable)
--- a/zephyr/debian/rules
+++ b/zephyr/debian/rules
@@ -14,7 +14,7 @@ export DH_COMPAT=3
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
-SONAME=3
+
 CONFIGURE_ROOT=--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --datadir=/etc  --with-ares=/usr --with-hesiod=/usr
 
 
@@ -36,13 +36,7 @@ build-stamp:
        set -e; \
        for dir in krb no-krb ; do  \
                cd $$dir; \
-       rm -f lib/*.o || true; \
-               $(MAKE) -C lib                  \
-                FPIC=                                  \
-                LIBEXT=a; \
-               rm -f lib/*.o; \
-               $(MAKE) LIBEXT=so \
-                       FPIC=-fpic SONAME=$(SONAME); \
+               $(MAKE)  ; \
                cd ..; \
                done
 
@@ -59,7 +53,7 @@ clean:
        -rm debian/zephyr-server-krb.templates
        -rm debian/zephyr-server-krb.config
        -rm debian/zephyr-server-krb.postinst
-       -rm debian/libzephyr3-krb.files
+       -rm debian/libzephyr4-krb.files
 
        dh_clean
 
@@ -74,10 +68,6 @@ install: build
        # Add here commands to install the package into debian/tmp.
        cd no-krb&&$(MAKE) install DESTDIR=`pwd`/../debian/tmp
        cd krb&&$(MAKE)  DESTDIR=`pwd`/../debian/tmp-krb install
-       mv debian/tmp/usr/lib/libzephyr.so debian/tmp/usr/lib/libzephyr.so.$(SONAME)
-       ln -s libzephyr.so.$(SONAME) debian/tmp/usr/lib/libzephyr.so
-               mv debian/tmp-krb/usr/lib/libzephyr.so debian/tmp-krb/usr/lib/libzephyr.so.$(SONAME)
-       ln -s libzephyr.so.$(SONAME) debian/tmp-krb/usr/lib/libzephyr.so
        mkdir -p debian/tmp/etc/zephyr/acl
        set -x; for i in debian/acl/*; do install -c -m 644 -o root $$i debian/tmp/etc/zephyr/acl; done; set +x
        install -c -m 644 debian/zephyr.vars debian/tmp/etc/zephyr
@@ -97,9 +87,9 @@ binary-arch: build install
        for file  in  files templates config postinst docs; do \
                cp debian/zephyr-server.$$file debian/zephyr-server-krb.$$file; \
                done
-       cp debian/libzephyr3.files debian/libzephyr3-krb.files
-       dh_movefiles  -plibzephyr3 -pzephyr-clients -pzephyr-server -plibzephyr-dev
-       dh_movefiles --sourcedir=debian/tmp-krb -plibzephyr3-krb -pzephyr-server-krb
+       cp debian/libzephyr4.files debian/libzephyr4-krb.files
+       dh_movefiles  -plibzephyr4 -pzephyr-clients -pzephyr-server -plibzephyr-dev
+       dh_movefiles --sourcedir=debian/tmp-krb -plibzephyr4-krb -pzephyr-server-krb
        dh_installdebconf 
        dh_installdocs
 #      dh_installexamples
@@ -121,7 +111,7 @@ binary-arch: build install
        # You may want to make some executables suid here.
        dh_makeshlibs
        # sigh
-       cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb/DEBIAN/shlibs
+       cp debian/libzephyr4/DEBIAN/shlibs debian/libzephyr4-krb/DEBIAN/shlibs
        dh_shlibdeps
        dh_installdeb
 #      dh_perl