aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2011-06-30 20:16:28 +0000
committerAlex Elder <aelder@sgi.com>2011-07-20 18:20:41 -0500
commit85947d728dc170a58f807d9f2c15e22237b110b9 (patch)
tree52127a7c82397f6d28ba8f4be2c104a8f99b0bc7
parent79a27d3764adce0cb9f50d63eb374e8b84bd6601 (diff)
downloaddmapi-dev-85947d728dc170a58f807d9f2c15e22237b110b9.tar.gz
dmapi: don't hard code the shell binary
(This is just replicating the change that Dave Chinner made in xfsprogs, xfsdump, and xfstests.) Recent changes to debian unstable user space have caused the xfsdump 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: Alex Elder <aelder@sgi.com>
-rw-r--r--include/builddefs.in1
-rw-r--r--include/buildmacros1
2 files changed, 1 insertions, 1 deletions
diff --git a/include/builddefs.in b/include/builddefs.in
index 96fed5a..3247e0f 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -42,6 +42,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 bffe891..bd0ad9f 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -29,7 +29,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