[X2Go-Commits] [pale-moon] 01/01: debian/rules: ignore js/src/build/autoconf/config.{guess, sub} if they do not exist.

git-admin at x2go.org git-admin at x2go.org
Fri Aug 17 16:05:59 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit a70de4a95dacae49e7f6b9e68f4eaccaf6b1eb60
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Aug 17 16:05:36 2018 +0200

    debian/rules: ignore js/src/build/autoconf/config.{guess,sub} if they do not exist.
---
 debian/changelog | 1 +
 debian/rules     | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 542eff3..306ef2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Whitespace fixup only.
     - Remove FIXME entry for MPL, downstream seems to do it wrongly, but it's
       not causing harm, so just keep it.
+    - Ignore js/src/build/autoconf/config.{guess,sub} if they do not exist.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
   * debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 232749a..884674f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,9 @@ override_dh_auto_configure:
 stamps/prepare-configure:: stamps/dummy
 	for dir in $(AUTOCONF_DIRS); do \
 		for file in config.guess config.sub; do \
-			sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' $$dir/$$file; \
+			if [ -e "$${file}" ]; then \
+				sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' $$dir/$$file; \
+			fi; \
 		done; \
 	done
 	chmod 755 configure js/src/configure
@@ -152,7 +154,9 @@ override_dh_auto_clean::
 	
 	for dir in $(AUTOCONF_DIRS); do \
 		for file in config.guess config.sub; do \
-			sed -i '2!b;/^exec "/ d' $$dir/$$file; \
+			if [ -e "$${file}" ]; then \
+				sed -i '2!b;/^exec "/ d' $$dir/$$file; \
+			fi; \
 		done; \
 	done
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list