diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-05-15 07:43:38 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-05-15 07:43:38 +0000 |
| commit | 29ad870fbbbaac52a53e87ad37917905fc53eb57 (patch) | |
| tree | e36679ca647528c0feccfe3f50d1270b90883db8 /Build/source/libs | |
| parent | 92486d080fa886f318db483b6580ad6dbcc83b56 (diff) | |
freetype, freetype2: build fix: Use $(SHELL) for sub-configure
git-svn-id: svn://tug.org/texlive/trunk@26398 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
| -rw-r--r-- | Build/source/libs/freetype/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype/Makefile.in | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.am | 4 | ||||
| -rw-r--r-- | Build/source/libs/freetype2/Makefile.in | 4 |
6 files changed, 16 insertions, 8 deletions
diff --git a/Build/source/libs/freetype/ChangeLog b/Build/source/libs/freetype/ChangeLog index 7651d6f4f80..b2fabdb38d4 100644 --- a/Build/source/libs/freetype/ChangeLog +++ b/Build/source/libs/freetype/ChangeLog @@ -1,3 +1,7 @@ +2012-05-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use $(SHELL) for sub-configure. + 2012-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Avoid using a 'config.site' file. diff --git a/Build/source/libs/freetype/Makefile.am b/Build/source/libs/freetype/Makefile.am index fb58eefce30..dc2ba91601e 100644 --- a/Build/source/libs/freetype/Makefile.am +++ b/Build/source/libs/freetype/Makefile.am @@ -28,8 +28,8 @@ ft-build/Makefile: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ - CC='$(CC)' CONFIG_SITE=/dev/null \ - $(abs_srcdir)/$(FREETYPE_TREE)/configure \ + CC='$(CC)' CONFIG_SITE=/dev/null CONFIG_SHELL='$(SHELL)' \ + $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared --disable-nls \ --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ diff --git a/Build/source/libs/freetype/Makefile.in b/Build/source/libs/freetype/Makefile.in index 7516a732b6e..c9427fd0c60 100644 --- a/Build/source/libs/freetype/Makefile.in +++ b/Build/source/libs/freetype/Makefile.in @@ -516,8 +516,8 @@ ft-build/Makefile: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ - CC='$(CC)' CONFIG_SITE=/dev/null \ - $(abs_srcdir)/$(FREETYPE_TREE)/configure \ + CC='$(CC)' CONFIG_SITE=/dev/null CONFIG_SHELL='$(SHELL)' \ + $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared --disable-nls \ --prefix=$(abs_builddir)/ft-install \ --libdir=$(abs_builddir) \ diff --git a/Build/source/libs/freetype2/ChangeLog b/Build/source/libs/freetype2/ChangeLog index 9885bff24e5..ee53338cd77 100644 --- a/Build/source/libs/freetype2/ChangeLog +++ b/Build/source/libs/freetype2/ChangeLog @@ -1,3 +1,7 @@ +2012-05-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use $(SHELL) for sub-configure. + 2012-03-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Avoid using a 'config.site' file. diff --git a/Build/source/libs/freetype2/Makefile.am b/Build/source/libs/freetype2/Makefile.am index 99e93f6076a..1fcd7b92a2b 100644 --- a/Build/source/libs/freetype2/Makefile.am +++ b/Build/source/libs/freetype2/Makefile.am @@ -32,8 +32,8 @@ ft-build/Makefile: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ - CC='$(CC)' CONFIG_SITE=/dev/null \ - $(abs_srcdir)/$(FREETYPE_TREE)/configure \ + CC='$(CC)' CONFIG_SITE=/dev/null CONFIG_SHELL='$(SHELL)' \ + $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared \ --with-old-mac-fonts \ --without-bzip2 \ diff --git a/Build/source/libs/freetype2/Makefile.in b/Build/source/libs/freetype2/Makefile.in index efa783869ae..532396af4c5 100644 --- a/Build/source/libs/freetype2/Makefile.in +++ b/Build/source/libs/freetype2/Makefile.in @@ -517,8 +517,8 @@ ft-build/Makefile: rm -rf ft-build $(MKDIR_P) ft-build cd ft-build && \ - CC='$(CC)' CONFIG_SITE=/dev/null \ - $(abs_srcdir)/$(FREETYPE_TREE)/configure \ + CC='$(CC)' CONFIG_SITE=/dev/null CONFIG_SHELL='$(SHELL)' \ + $(SHELL) $(abs_srcdir)/$(FREETYPE_TREE)/configure \ $(config_args) --disable-shared \ --with-old-mac-fonts \ --without-bzip2 \ |