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/piklab | |
| 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/piklab')
| -rwxr-xr-x | ubuntu/maverick/applications/piklab/debian/rules | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index bd2651dca..82134f449 100755 --- a/ubuntu/maverick/applications/piklab/debian/rules +++ b/ubuntu/maverick/applications/piklab/debian/rules @@ -32,7 +32,7 @@ post-patches:: dh_testdir config: post-patches config-stamp -config-stamp: configure +config-stamp: dh_testdir ! [ -f /usr/share/libtool/ltmain.sh ] || \ @@ -40,17 +40,16 @@ config-stamp: 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 - 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 + ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ @@ -69,21 +68,12 @@ clean:: dh_testdir dh_testroot - ! [ -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 config-stamp build-stamp + rm -f config-stamp build-stamp [ ! -f Makefile ] || $(MAKE) distclean rm -f po/*.gmo rm -f src/common/global/svn_revision/svn_revision.h rm -f config.sub config.guess config.status config.log - dh_clean + dh_clean install: build-stamp dh_testdir |