Don't hardcode /bin/sh as shell, and don't use obsolete calling convention

       * Makefile.in.in: Don't hardcode /bin/sh as shell, and
        don't use obsolete calling convention for config.status.
        Reported by Loïc Minier

svn path=/trunk/; revision=22428

diff --git a/po/ChangeLog b/po/ChangeLog
index 64c593b36e943da93bb48ce845033ca65f51a0df..a3d2e24a44d0bc9cc6c88224cceb23f4541c6df8 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-01  Matthas Clasen  <mclasen@redhat.com>
+
+       Bug 573515 – po-properties/ special Makefile.in.in handling causes
+       failure to build
+
+       * Makefile.in.in: Don't hardcode /bin/sh as shell, and
+       don't use obsolete calling convention for config.status.
+       Reported by Loïc Minier
+
 2009-02-27  Rajesh Ranjan  <rajeshkajha@yahoo.com>
 
        * mai.po: Updated gtk+ for maithili

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 2643747baf9809726bd3003d6b30ac42d72564ff..28a3d40231e13ac2590e9caba3a2b1d5369f1a68 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -16,7 +16,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 @SET_MAKE@
 
 srcdir = @srcdir@
@@ -265,8 +265,7 @@ POTFILES: POTFILES.in
 
 Makefile: Makefile.in.in ../config.status POTFILES
        cd .. \
-         && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-              $(SHELL) ./config.status
+         && $(SHELL) ./config.status $(subdir)/$@.in
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.