From bb657452ac80bccbd346760703c5f3fdadfc36f3 Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Sun, 19 Sep 2010 04:29:56 -0400 Subject: [PATCH] Partial revert "debian: remove all autoreconf and cleanup targets" With the m4 directories split up across all the submodules, having the debian/rules for each plugin run autoreconf should be safe. This is a partial revert, not adding back the debian/rules clean target rules. Use ./buildgen.sh cleanall to remove autoreconf'd files. This reverts commit bad5ae3730ac078713bca046a78bd98b21e90706. --- ChangeLog | 3 ++- debian/rules | 1 + opensync-plugin-0.4x/debian/rules | 1 + opensync-plugin/debian/rules | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a0ecd5bd..77322ecb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,8 +3,9 @@ Release: version 0.17 - 2010/01/?? 2010/09/19 - further split up the m4 directories to make the submodules yet more independent + - debian: added back the autoreconf targets, but not cleanup targets 2010/09/18 - - debian: remove all autoreconf and cleanup targets + - debian: remove all autoreconf and cleanup targets Having the debian/rules files try to manage their own autoreconf is too much of a headache. Binary packages should start with a valid autoconf and gettext / autopoint diff --git a/debian/rules b/debian/rules index 807db806..a8d7569c 100755 --- a/debian/rules +++ b/debian/rules @@ -87,6 +87,7 @@ install/barrybackup-gui:: post-patches:: @rm -f $(CURDIR)/deb_srcdir @ln -s $(DEB_SRCDIR) $(CURDIR)/deb_srcdir + @test -x $(DEB_SRCDIR)/configure && echo "allready autoreconf" || (cd $(DEB_SRCDIR) && autoreconf -i) os22-binary:: binary # DEB_SRCDIR can be relative, so change into directory to use pwd. diff --git a/opensync-plugin-0.4x/debian/rules b/opensync-plugin-0.4x/debian/rules index e01feddd..7a57c514 100755 --- a/opensync-plugin-0.4x/debian/rules +++ b/opensync-plugin-0.4x/debian/rules @@ -26,6 +26,7 @@ DEB_INSTALL_DOCS_ALL = post-patches:: @rm -f $(CURDIR)/deb_srcdir @ln -s $(DEB_SRCDIR) $(CURDIR)/deb_srcdir + @test -x $(DEB_SRCDIR)/configure && echo "allready autoreconf" || (cd $(DEB_SRCDIR) && autoreconf -i) makebuilddir:: # This rule is meant for the parent debian/rules to be able to call diff --git a/opensync-plugin/debian/rules b/opensync-plugin/debian/rules index 1d038ec7..73428ff6 100755 --- a/opensync-plugin/debian/rules +++ b/opensync-plugin/debian/rules @@ -26,6 +26,7 @@ DEB_INSTALL_DOCS_ALL = post-patches:: @rm -f $(CURDIR)/deb_srcdir @ln -s $(DEB_SRCDIR) $(CURDIR)/deb_srcdir + @test -x $(DEB_SRCDIR)/configure && echo "allready autoreconf" || (cd $(DEB_SRCDIR) && autoreconf -i) makebuilddir:: # This rule is meant for the parent debian/rules to be able to call -- 2.11.4.GIT