Merge commit 'upstream/2.13'

[debian/cpmtools] / debian / rules

diff --git a/debian/rules b/debian/rules
index 110b7e3e15be869abc34c9a047fea9ff71a55e3a..31d753cf39b07801bc330c95c04fa93f9e4ef213 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 configure: configure-stamp
 configure-stamp:
        dh_testdir
+       cp /usr/share/misc/config.sub config.sub
+       cp /usr/share/misc/config.guess config.guess
        ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
                --datarootdir=/etc/cpmtools
        touch configure-stamp
@@ -22,12 +24,6 @@ clean:
        dh_testroot
        rm -f build-stamp configure-stamp
        [ ! -f Makefile ] || $(MAKE) distclean
-
-       -test -r /usr/share/misc/config.sub && \
-               cp -f /usr/share/misc/config.sub config.sub
-       -test -r /usr/share/misc/config.guess && \
-               cp -f /usr/share/misc/config.guess config.guess
-
        dh_clean
 
 install: build
@@ -35,7 +31,8 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       $(MAKE) install prefix=$(CURDIR)/debian/cpmtools/usr 
+       $(MAKE) install prefix=$(CURDIR)/debian/cpmtools/usr \
+               datarootdir=$(CURDIR)/debian/cpmtools/etc/cpmtools
 
 # Build architecture-independent files here.
 binary-indep: build install