Less ugly setup.py calls for python.

Install library symlinks.

diff --git a/debian/librrd-dev.install b/debian/librrd-dev.install
index dccee1a98fc1e2f135372aafc2746b43c3735ffe..718865277a68d16cfb52791ea162a0e0f3dab452 100644 (file)
--- a/debian/librrd-dev.install
+++ b/debian/librrd-dev.install
@@ -3,5 +3,3 @@ usr/lib/librrd.a
 usr/lib/librrd_th.a
 usr/lib/librrd.la
 usr/lib/librrd_th.la
-usr/lib/librrd.so
-usr/lib/librrd_th.so

diff --git a/debian/rules b/debian/rules
index 4d7a850b25554cde84a7aa792aa3093084f44113..128f3edb655a8d994e92b875eda29057291fe6c3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-Makefile.am:librrd_la_LDFLAGS         = -version-info 2:12:0
-Makefile.am:librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:11:0
-
-
 
 #library versions
 LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \
@@ -15,7 +11,7 @@ LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \
 LIB_major := $(shell echo $(LIB_version) | sed 's,\..*,,g')
 LIB_TH_version := $(shell grep '^librrd_th_la_LDFLAGS' src/Makefile.am | \
                            sed 's,^[^0-9]*,,g;s,:,.,g')
-LIB_major := $(shell echo $(LIB_th_version) | sed 's,\..*,,g')
+LIB_TH_major := $(shell echo $(LIB_th_version) | sed 's,\..*,,g')
 
 
 
@@ -85,7 +81,9 @@ build-arch-stamp: config.status
        touch $@
 
 build-python%: build-arch-stamp
-       cd bindings/python && env BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
+       set -e ;\
+        cd bindings/python ;\
+        BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
        touch $@
 
 build-indep: build-indep-stamp
@@ -118,7 +116,9 @@ endif
        dh_clean
 
 clean-python%:
-       cd bindings/python && python$* setup.py clean
+       set -e ;\
+        cd bindings/python ;\
+        python$* setup.py clean
        rm -f build-python$*
 
 install: install-indep install-arch
@@ -157,7 +157,9 @@ install-python%:
        dh_testdir
        dh_testroot
        dh_clean -k -s
-       cd bindings/python && python$* setup.py install --root=$(CURDIR)/debian/python-rrd
+       set -e ;\
+        cd bindings/python ;\
+        python$* setup.py install --root=$(CURDIR)/debian/python-rrd
 
 
 binary-indep:
@@ -187,6 +189,10 @@ binary-arch: build-arch install-arch
        dh_pysupport -ppython-rrd
        dh_perl -a
        dh_installman -a
+       dh_link -plibrrd-dev librrd.so.$(LIB_version) /usr/lib/librrd.so
+       dh_link -plibrrd-dev librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so
+       dh_link -plibrrd$(LIB_major) librrd.so.$(LIB_version) /usr/lib/librrd.so.$(LIB_major)
+       dh_link -plibrrd$(LIB_major) librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so.$(LIB_TH_major)
        dh_link -a
        dh_strip -a
        dh_compress -a