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 f895ed91dc6dd4707a1880f3dc5c724781427bba..4c8ec645cb2d0d7ada00e35bcec1e658a7b64cd8 100644 (file)
--- 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 62babca2a0c5149ba10e93df775435c50d34bd2b..31c7eb0136551479432aab2726c0af8cf2602449 100644 (file)
--- 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