Mercurial > mxe-octave

changeset 1080:5602f49af84e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix: use consistently "CONFIG_SHELL=$(SHELL)" to fix packages that contain bashisms
author Volker Grabsch <vog@notjusthosting.com>
date Fri, 16 Jul 2010 13:23:37 +0200
parents 5a67a60d7367
children 5a29ddfd25e8 34f5daca82f4
files src/gettext.mk src/xerces.mk
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gettext.mk	Tue Jul 13 13:28:15 2010 +0200
+++ b/src/gettext.mk	Fri Jul 16 13:23:37 2010 +0200
@@ -26,6 +26,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads=win32 \
         --without-libexpat-prefix \
-        --without-libxml2-prefix
-    $(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' SHELL=bash install
+        --without-libxml2-prefix \
+        CONFIG_SHELL=$(SHELL)
+    $(MAKE) -C '$(1)/gettext-runtime/intl' -j '$(JOBS)' install
 endef
--- a/src/xerces.mk	Tue Jul 13 13:28:15 2010 +0200
+++ b/src/xerces.mk	Fri Jul 16 13:23:37 2010 +0200
@@ -21,7 +21,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(SHELL) ./configure \
+    cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
@@ -43,7 +43,8 @@
         --disable-msgloader-icu \
         --with-curl='$(PREFIX)/$(TARGET)' \
         --without-icu \
-        LIBS="`$(TARGET)-pkg-config --libs libcurl`"
+        LIBS="`$(TARGET)-pkg-config --libs libcurl`" \
+        CONFIG_SHELL=$(SHELL)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=