From: Dave Chinner <dchinner@redhat.com>
Date: Sat, 16 Jul 2011 17:41:19 +0000 (+1000)
Subject: xfsprogs: don't hard code the shell binary
X-Git-Tag: v3.1.6~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6abbfed5d6a31b7bd7607a0be9a634b18ec57bee;p=thirdparty%2Fxfsprogs-dev.git

xfsprogs: don't hard code the shell binary

Recent changes to debian unstable user space have caused the
xfsprogs build to break as certain shell functionality is being
assumed by libtool and friends.  The configure scripts test and
select the correct shell, but the input files ignore this and hard
code the shell to use and hence now break.

Fix this by using the shell that the configure scripts decide is the
right one to use.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---

diff --git a/include/builddefs.in b/include/builddefs.in
index f895ed91d..4c8ec645c 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -71,6 +71,7 @@ MAKE		= @make@
 ECHO		= @echo@
 SORT		= @sort@
 LN_S		= @LN_S@
+SHELL		= @SHELL@
 LIBTOOL		= @LIBTOOL@
 MAKEDEPEND	= @makedepend@
 
diff --git a/include/buildmacros b/include/buildmacros
index 62babca2a..31c7eb013 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -32,7 +32,6 @@ OBJECTS = $(ASFILES:.s=.o) \
 
 INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
 
-SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images
 DIST_DIR = $(TOPDIR)/dist