| 47dff09e | 2015-01-14 20:49:37 | Slávek Banko |
Fix regeneration of automake build system on Debian and Ubuntu Signed-off-by: Slávek Banko <slavek.banko@...> |
||
|
M debian/lenny/applications/basket/debian/rules M debian/lenny/applications/kchmviewer/debian/rules M debian/lenny/applications/kcpuload/debian/rules M debian/lenny/applications/kdbusnotification/debian/rules M debian/lenny/applications/kmyfirewall/debian/rules M debian/lenny/applications/knights/debian/rules M debian/lenny/applications/knowit/debian/rules M debian/lenny/applications/knutclient/debian/rules M debian/lenny/applications/kpicosim/debian/rules M debian/lenny/applications/ksplash-engine-moodin/debian/rules M debian/lenny/applications/ksquirrel/debian/rules M debian/lenny/applications/ktechlab/debian/rules M debian/lenny/applications/piklab/debian/rules M debian/lenny/applications/potracegui/debian/rules M debian/lenny/applications/tderadio/debian/rules M debian/lenny/applications/tellico/debian/rules M debian/lenny/libraries/libksquirrel/debian/rules M debian/squeeze/applications/basket/debian/rules M debian/squeeze/applications/kchmviewer/debian/rules M debian/squeeze/applications/kcpuload/debian/rules M debian/squeeze/applications/kdbusnotification/debian/rules M debian/squeeze/applications/kmyfirewall/debian/rules M debian/squeeze/applications/knights/debian/rules M debian/squeeze/applications/knowit/debian/rules M debian/squeeze/applications/knutclient/debian/rules M debian/squeeze/applications/kpicosim/debian/rules M debian/squeeze/applications/ksplash-engine-moodin/debian/rules M debian/squeeze/applications/ksquirrel/debian/rules M debian/squeeze/applications/ktechlab/debian/rules M debian/squeeze/applications/piklab/debian/rules M debian/squeeze/applications/potracegui/debian/rules M debian/squeeze/applications/tderadio/debian/rules M debian/squeeze/applications/tellico/debian/rules M debian/squeeze/libraries/libksquirrel/debian/rules M ubuntu/maverick/applications/basket/debian/rules M ubuntu/maverick/applications/kchmviewer/debian/rules M ubuntu/maverick/applications/kcpuload/debian/rules M ubuntu/maverick/applications/kdbusnotification/debian/rules M ubuntu/maverick/applications/kmyfirewall/debian/rules M ubuntu/maverick/applications/knights/debian/rules M ubuntu/maverick/applications/knowit/debian/rules M ubuntu/maverick/applications/knutclient/debian/rules M ubuntu/maverick/applications/kpicosim/debian/rules M ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules M ubuntu/maverick/applications/ksquirrel/debian/rules M ubuntu/maverick/applications/ktechlab/debian/rules M ubuntu/maverick/applications/piklab/debian/rules M ubuntu/maverick/applications/potracegui/debian/rules M ubuntu/maverick/applications/tderadio/debian/rules M ubuntu/maverick/applications/tellico/debian/rules M ubuntu/maverick/libraries/libksquirrel/debian/rules |
||
diff --git a/debian/lenny/applications/basket/debian/rules b/debian/lenny/applications/basket/debian/rules
index 4e68334..9513fe0 100755
--- a/debian/lenny/applications/basket/debian/rules
+++ b/debian/lenny/applications/basket/debian/rules
@@ -33,11 +33,8 @@
config.status: post-patches
dh_testdir
- test -e config.sub -a -L config.sub || \
- ln -sf /usr/share/misc/config.sub config.sub
- test -e config.guess -a -L config.guess || \
- ln -sf /usr/share/misc/config.guess config.guess
-
+ cp -p /usr/share/misc/config.sub admin/config.sub
+ cp -p /usr/share/misc/config.guess admin/config.guess
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
$(MAKE) -f admin/Makefile.common dist;
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index f9da12f..75422d3 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -48,14 +48,12 @@
! [ -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
-
+ cp -p /usr/share/misc/config.sub admin/config.sub
+ cp -p /usr/share/misc/config.guess admin/config.guess
+
make -f admin/Makefile.common cvs
# automake
# autoconf
- test -e config.sub -a -L config.sub || \
- ln -sf /usr/share/misc/config.sub config.sub
- test -e config.guess -a -L config.guess || \
- ln -sf /usr/share/misc/config.guess config.guess
[ -d build-kde ] || mkdir build-kde
cd build-kde && ../configure CFLAGS="$(CFLAGS)" $(CONFIGURE_OPTIONS_TDE)
diff --git a/debian/lenny/applications/kcpuload/debian/rules b/debian/lenny/applications/kcpuload/debian/rules
index 385c243..83e0a51 100755
--- a/debian/lenny/applications/kcpuload/debian/rules
+++ b/debian/lenny/applications/kcpuload/debian/rules
@@ -49,22 +49,14 @@
configure-stamp:
dh_testdir
- # Apply Debian specific patches
- if test ! -f patch-stamp; then \
- for patch in $(CURDIR)/debian/patches/*.diff ;\
- do \
- echo APPLYING PATCH\: $${patch##*/};\
- patch -p1 < $$patch ;\
- done ;\
- touch patch-stamp ;\
- fi
-
! [ -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
-
+ cp -p /usr/share/misc/config.sub admin/config.sub
+ cp -p /usr/share/misc/config.guess admin/config.guess
+
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@@ -100,16 +92,6 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
- # Remove Debian specific patches
- if test -f patch-stamp; then \
- for patch in $(CURDIR)/debian/patches/*.diff ;\
- do \
- echo REMOVING PATCH\: $${patch##*/};\
- patch -p1 -R < $$patch ;\
- done ;\
- rm -f patch-stamp ;\
- fi
# Remove build tree
rm -rf $(objdir)
diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules
index 94d0ad5..842cf0e 100755
--- a/debian/lenny/applications/kdbusnotification/debian/rules
+++ b/debian/lenny/applications/kdbusnotification/debian/rules
@@ -53,22 +53,14 @@
configure-stamp:
dh_testdir
- # Apply Debian specific patches
- if test ! -f patch-stamp; then \
- for patch in $(CURDIR)/debian/patches/*.diff ;\
- do \
- echo APPLYING PATCH\: $${patch##*/};\
- patch -p1 < $$patch ;\
- done ;\
- touch patch-stamp ;\
- fi
-
! [ -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
-
+ cp -p /usr/share/misc/config.sub admin/config.sub
+ cp -p /usr/share/misc/config.guess admin/config.guess
+
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@@ -104,16 +96,6 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp debian/debiandirs
-
- # Remove Debian specific patches
- if test -f patch-stamp; then \
- for patch in $(CURDIR)/debian/patches/*.diff ;\
- do \
- echo REMOVING PATCH\: $${patch##*/};\
- patch -p1 -R < $$patch ;\
- done ;\
- rm -f patch-stamp ;\
- fi
# Remove build tree
rm -rf $(objdir)
diff --git a/debian/lenny/applications/kmyfirewall/debian/rules b/debian/lenny/applications/kmyfirewall/debian/rules
index 28035c7..5894cdd 100755
--- a/debian/lenny/applications/kmyfirewall/debian/rules
+++ b/debian/lenny/applications/kmyfirewall/debian/rules
@@ -40,7 +40,7 @@
# perl -w admin/debianrules echodirs > debian/debiandirs
-config.status: configure
+config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -48,17 +48,17 @@
! [ -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
-
+ifneq "$(wildcard /usr/share/misc/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 admin/config.guess
+endif
+
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
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
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 @@
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
diff --git a/debian/lenny/applications/knights/debian/rules b/debian/lenny/applications/knights/debian/rules
index f4f406c..26d343f 100755
--- a/debian/lenny/applications/knights/debian/rules
+++ b/debian/lenny/applications/knights/debian/rules
@@ -39,7 +39,7 @@
convert $< $@
-config.status: configure
+config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -47,6 +47,8 @@
! [ -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
+ cp -p /usr/share/misc/config.sub admin/config.sub
+ cp -p /usr/share/misc/config.guess admin/config.guess
make -f admin/Makefile.common cvs
touch debian/stamp-bootstrap
@@ -67,20 +69,11 @@
dh_testdir
dh_testroot
rm -f po/de.gmo
- 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
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean
+ dh_clean
install: build
dh_testdir
diff --git a/debian/lenny/applications/knowit/debian/rules b/debian/lenny/applications/knowit/debian/rules
index 0a090fd..07ea32c 100755
--- a/debian/lenny/applications/knowit/debian/rules
+++ b/debian/lenny/applications/knowit/debian/rules
@@ -25,7 +25,7 @@
CFLAGS += -O2
endif
-config.status: configure
+config.status:
dh_testdir
! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -33,6 +33,8 @@
! [ -f /usr/share/libtool/config/ltmain.sh ] || \
** Diff limit reached (max: 250 lines) **
|
||