gnuzilla

commit 395cc0798600cde44a30abaa3f5d08ce8b68f782
parent e9d924b40b4ad6ffd75244d319440a13c2877535
Author: Amin Bandali <bandali@gnu.org>
Date:   Mon, 21 Oct 2019 10:53:08 -0400

Fix build failure

* makeicecat: add `mkdir -p \$(DIST)/bin/browser/extensions' to
browser/app/Makefile.in, before trying to cp files/dirs into it.
Fixes the following build error:

39:05.34 cp: target '../../dist/bin/browser/extensions' is not a directory
39:05.34 make[4]: *** [Makefile:118: libs] Error 1
39:05.34 make[3]: *** [/data/bandali/usr/bld/gnuzilla/icecat-68.1.0/config/recurse.mk:101: browser/app/libs] Error 2
39:05.34 make[2]: *** [/data/bandali/usr/bld/gnuzilla/icecat-68.1.0/config/recurse.mk:34: libs] Error 2
39:05.34 make[1]: *** [/data/bandali/usr/bld/gnuzilla/icecat-68.1.0/config/rules.mk:413: default] Error 2
39:05.34 make: *** [client.mk:125: build] Error 2

Diffstat:
M
makeicecat
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/makeicecat b/makeicecat
@@ -554,8 +554,9 @@ cp $DATA/extensions/ extensions/gnu -a
 
 cat << EOF >> browser/app/Makefile.in
 libs::
-	cp -a \$(topsrcdir)/extensions/gnu/* \$(DIST)/bin/browser/extensions
-	mkdir -p \$(DIST)/icecat/browser/extensions/ 
+	mkdir -p \$(DIST)/bin/browser/extensions
+	cp -a \$(topsrcdir)/extensions/gnu/* \$(DIST)/bin/browser/extensions/
+	mkdir -p \$(DIST)/icecat/browser/extensions
 	cp -a \$(topsrcdir)/extensions/gnu/* \$(DIST)/icecat/browser/extensions/
 EOF
 
@@ -563,7 +564,7 @@ EOF
 cat << EOF >> mobile/android/app/Makefile.in
 libs::
 	mkdir -p \$(DIST)/bin/distribution
-	cp -a \$(topsrcdir)/extensions/gnu/ \$(DIST)/bin/distribution/extensions
+	cp -a \$(topsrcdir)/extensions/gnu/ \$(DIST)/bin/distribution/extensions/
 EOF
 
 #sed '/^make-package-internal:/ s%$%\n\tcp $(topsrcdir)/extensions.gnu/* $(DIST)/icecat/browser/extensions -a%' -i toolkit/mozapps/installer/packager.mk