diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-07-16 11:23:37 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-07-16 11:23:37 (GMT) |
| commit | 040a708d86bfea9212645a9498d5864a04832d79 (patch) | |
| tree | cd8256ce553ec98f55a324485e79dca39b8b94f8 /src | |
| parent | 9da013c6b9c289c3b820ce3a1dee3ce42be256f9 (diff) | |
| download | mxe-040a708d86bfea9212645a9498d5864a04832d79.zip mxe-040a708d86bfea9212645a9498d5864a04832d79.tar.gz mxe-040a708d86bfea9212645a9498d5864a04832d79.tar.bz2 | |
bugfix: use consistently "CONFIG_SHELL=$(SHELL)" to fix packages that contain bashisms
Diffstat (limited to 'src')
| -rw-r--r-- | src/gettext.mk | 5 | ||||
| -rw-r--r-- | src/xerces.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gettext.mk b/src/gettext.mk index db53700..c24f59b 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -26,6 +26,7 @@ define $(PKG)_BUILD --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 diff --git a/src/xerces.mk b/src/xerces.mk index 0ffda3e..87ae682 100644 --- a/src/xerces.mk +++ b/src/xerces.mk @@ -21,7 +21,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && $(SHELL) ./configure \ + cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -43,7 +43,8 @@ define $(PKG)_BUILD --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= |