Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool

[pkg-rrdtool.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 0f8a40a3bac453dc4763811fde7ca92cd0eadb68..7117f55039f61accefa418ff7b0ceeed5dd2f855 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,7 @@ CONFFLAGS += --disable-python --disable-ruby
 CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/rrdtool
 
 #install perl libs in vendor mode
-CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor
-
+CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor 
 
 
 
@@ -81,6 +80,8 @@ build-arch-stamp: config.status
 
        #configure forgets to set TCL_INC_DIR.
        make TCL_INC_DIR=/usr/include/tcl
+       #Fix library path to tcl bindings
+       sed -i -e 's|lib/|lib/tcltk/rrdtool-tcl/|' bindings/tcl/pkgIndex.tcl
        touch $@
 
 build-python%: build-arch-stamp
@@ -167,11 +168,10 @@ binary-indep: build-indep install-indep
        dh_testdir
        dh_testroot
        dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
-       dh_link -plibrrd2-dev /usr/share/doc/librrd-dev /usr/share/doc/librrd2-dev
        dh_link -ppython-rrd /usr/share/doc/python-rrdtool /usr/share/doc/python-rrd
-       dh_installchangelogs -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
-       dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
-       dh_link -i -Nlibrrd-ruby -Nlibrrd2-dev -Npython-rrd
+       dh_installchangelogs -i -Nlibrrd-ruby -Npython-rrd
+       dh_installdocs -i -Nlibrrd-ruby -Npython-rrd
+       dh_link -i -Nlibrrd-ruby -Npython-rrd
        echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
        dh_perl -i
        dh_compress -i
@@ -186,6 +186,7 @@ binary-arch: build-arch install-arch
        dh_testdir
        dh_testroot
        dh_installchangelogs -a CHANGES
+       dh_installdocs -A CONTRIBUTORS
        dh_installdocs -a
 #      dh_installexamples -a
        dh_pysupport -ppython-rrdtool