From 9290b5cc09cafd96116c3ae8373bc7ec98dc5347 Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Sun, 19 May 2002 09:39:18 +0000 Subject: [PATCH] All the hard-coded calls to scripts/dpkg-gencontrol.pl are now down thru a variable, GENCONTROL. --- ChangeLog | 5 +++++ debian/rules | 14 ++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a6295eb..2c998bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 19 04:41:07 CDT 2002 Adam Heath + + * debian/rules: All the hard-coded calls to scripts/dpkg-gencontrol.pl + are now down thru a variable, GENCONTROL. + Sun May 19 04:26:58 CDT 2002 Adam Heath * debian/rules: Remove all calls to $(shell pwd), and use $(CURDIR). diff --git a/debian/rules b/debian/rules index 7c28f66d..18173c92 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,8 @@ DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2> /dev/nul DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2> /dev/null || true) arch := $(shell dpkg-architecture -qDEB_HOST_ARCH) +GENCONTROL := perl -I $(CURDIR)/scripts scripts/dpkg-gencontrol.pl -isp + ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) config_arg := --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) else @@ -157,8 +159,7 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary% `test -z "$(static)" && echo $(TMP_DPKG)/usr/bin/dpkg $(TMP_DPKG)/usr/bin/md5sum $(TMP_DPKG)/usr/bin/dpkg-deb` binary-dpkg binary-dpkg-static: %: %-most - perl -I $(CURDIR)/scripts scripts/dpkg-gencontrol.pl -isp \ - -Tdebian/dpkg$(static).substvars -pdpkg$(static) -P$(TMP_DPKG) + $(GENCONTROL) -Tdebian/dpkg$(static).substvars -pdpkg$(static) -P$(TMP_DPKG) dpkg --build $(TMP_DPKG) .. binary-dpkg-dev: stamp-binary @@ -216,8 +217,7 @@ binary-dpkg-dev: stamp-binary install -p -m 755 -o root -g root debian/dpkg-dev.prerm $(TMP_DPKG_DEV)/DEBIAN/prerm install -p -m 755 -o root -g root debian/dpkg-dev.postinst $(TMP_DPKG_DEV)/DEBIAN/postinst - perl -I $(CURDIR)/scripts scripts/dpkg-gencontrol.pl -isp \ - -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV) + $(GENCONTROL) -Tdebian/dpkg-dev.substvars -pdpkg-dev -P$(TMP_DPKG_DEV) dpkg --build $(TMP_DPKG_DEV) .. binary-dselect: stamp-binary @@ -256,8 +256,7 @@ binary-dselect: stamp-binary dpkg-shlibdeps -Tdebian/dselect.substvars \ $(TMP_DSELECT)/usr/bin/dselect - perl -I $(CURDIR)/scripts scripts/dpkg-gencontrol.pl -isp \ - -Tdebian/dselect.substvars -pdselect -P$(TMP_DSELECT) + $(GENCONTROL) -Tdebian/dselect.substvars -pdselect -P$(TMP_DSELECT) dpkg --build $(TMP_DSELECT) .. binary-dpkg-doc: stamp-binary @@ -284,8 +283,7 @@ binary-dpkg-doc: stamp-binary install -p -m 755 -o root -g root debian/dpkg-doc.prerm $(TMP_DPKG_DOC)/DEBIAN/prerm install -p -m 755 -o root -g root debian/dpkg-doc.postinst $(TMP_DPKG_DOC)/DEBIAN/postinst - perl -I $(CURDIR)/scripts scripts/dpkg-gencontrol.pl -isp \ - -Tdebian/dpkg-doc.substvars -pdpkg-doc -P$(TMP_DPKG_DOC) + $(GENCONTROL) -Tdebian/dpkg-doc.substvars -pdpkg-doc -P$(TMP_DPKG_DOC) dpkg --build $(TMP_DPKG_DOC) .. binary-arch-static: binary-dpkg-static -- 2.39.5