diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-01-15 03:49:37 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-01-15 03:50:10 +0100 |
| commit | bd43cd469600f15aac2786fd0fa6bd1397aca611 (patch) | |
| tree | 28b062a6094095acccd3e06c18d766222164381b /ubuntu/maverick/applications/kmyfirewall/debian | |
| parent | 81a56a94f72eaafc3189fbc88de64eb960482a21 (diff) | |
| download | tde-packaging-bd43cd469600f15aac2786fd0fa6bd1397aca611.tar.gz tde-packaging-bd43cd469600f15aac2786fd0fa6bd1397aca611.zip | |
Fix regeneration of automake build system on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 47dff09e22d601a9efe65b4e25b06d1d3a1f1926)
Diffstat (limited to 'ubuntu/maverick/applications/kmyfirewall/debian')
| -rwxr-xr-x | ubuntu/maverick/applications/kmyfirewall/debian/rules | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/rules b/ubuntu/maverick/applications/kmyfirewall/debian/rules index 28035c796..5894cdd46 100755 --- a/ubuntu/maverick/applications/kmyfirewall/debian/rules +++ b/ubuntu/maverick/applications/kmyfirewall/debian/rules @@ -40,7 +40,7 @@ endif # perl -w admin/debianrules echodirs > debian/debiandirs -config.status: configure +config.status: dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -48,17 +48,17 @@ config.status: configure ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap - - # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.sub admin/config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess + cp -f /usr/share/misc/config.guess admin/config.guess endif + + make -f admin/Makefile.common cvs + touch debian/stamp-bootstrap + + # Add here commands to configure the package. CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde @@ -75,16 +75,7 @@ build-stamp: config.status clean: dh_testdir dh_testroot - rm -f build-stamp - - ! [ -f /usr/share/libtool/ltmain.sh ] || \ - cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh - ! [ -f /usr/share/libtool/config/ltmain.sh ] || \ - cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh - cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in - - make -f admin/Makefile.common cvs - touch debian/stamp-bootstrap + rm -f build-stamp # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean |