From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 2 Sep 2016 18:53:59 +0000 (-0400)
Subject: Fix directory changes to use explicit subshells
X-Git-Tag: krb5-1.15-beta1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69571141ccc2483b54e015a5d7c77d1e926f2822;p=thirdparty%2Fkrb5.git

Fix directory changes to use explicit subshells

We depend on the behavior of having a separate subshell for each line in
our Makefiles, so force it where make (observed FreeBSD 10.3) does not
create one.

[ghudson@mit.edu: also changed rules in config/post.in]

ticket: 8492 (new)
target_version: 1.14-next
target_version: 1.13-next
tags: pullup
---

diff --git a/src/build-tools/Makefile.in b/src/build-tools/Makefile.in
index 729d1153f5..5dcae118a5 100644
--- a/src/build-tools/Makefile.in
+++ b/src/build-tools/Makefile.in
@@ -14,7 +14,7 @@ PKGCONFIG_FILES = \
 all-unix: krb5-config $(PKGCONFIG_FILES)
 
 krb5-config $(PKGCONFIG_FILES): $(BUILDTOP)/config.status
-	cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/$@
+	(cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/$@)
 krb5-config: $(srcdir)/krb5-config.in
 kadm-client.pc: $(srcdir)/kadm-client.pc.in
 kadm-server.pc: $(srcdir)/kadm-server.pc.in
diff --git a/src/config/post.in b/src/config/post.in
index d792abc487..77a9bffdf3 100644
--- a/src/config/post.in
+++ b/src/config/post.in
@@ -177,15 +177,15 @@ Makefiles-prerecurse: Makefile
 # mydir = relative path from top to this Makefile
 Makefile: $(srcdir)/Makefile.in $(srcdir)/deps $(BUILDTOP)/config.status \
 		$(top_srcdir)/config/pre.in $(top_srcdir)/config/post.in
-	cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/Makefile
+	(cd $(BUILDTOP) && $(SHELL) config.status $(mydir)/Makefile)
 $(BUILDTOP)/config.status: $(top_srcdir)/configure
-	cd $(BUILDTOP) && $(SHELL) config.status --recheck
+	(cd $(BUILDTOP) && $(SHELL) config.status --recheck)
 $(top_srcdir)/configure: @MAINT@ \
 		$(top_srcdir)/configure.in \
 		$(top_srcdir)/patchlevel.h \
 		$(top_srcdir)/aclocal.m4
-	cd $(top_srcdir) && \
-		$(AUTOCONF) --include=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS)
+	(cd $(top_srcdir) && \
+		$(AUTOCONF) --include=$(CONFIG_RELTOPDIR) $(AUTOCONFFLAGS))
 
 RECURSE_TARGETS=all-recurse clean-recurse distclean-recurse install-recurse \
 	generate-files-mac-recurse \
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 1f9c257f21..1fb5fea927 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -93,8 +93,8 @@ pdf: $(PDFDIR)
 composite: Doxyfile $(docsrc)/version.py
 	rm -rf doxy rst_apiref rst_composite
 	$(DOXYGEN)
-	cwd=`pwd`; cd $(docsrc)/tools && \
-		$(PYTHON) doxy.py -i $$cwd/doxy/xml -o $$cwd/rst_apiref
+	(cwd=`pwd`; cd $(docsrc)/tools && \
+		$(PYTHON) doxy.py -i $$cwd/doxy/xml -o $$cwd/rst_apiref)
 	mkdir -p rst_composite
 	do_subdirs="$(RST_SOURCES)" ; \
 	for i in $$do_subdirs; do \
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index d981102e51..f5b9218330 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -34,7 +34,7 @@ all-unix: @MAINT@ verify-calling-conventions-krb5
 
 $(srcdir)/autoconf.h.in: @MAINT@ $(srcdir)/autoconf.stmp
 $(srcdir)/autoconf.stmp: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
-	cd $(top_srcdir) && $(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
+	(cd $(top_srcdir) && $(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS))
 	touch $(srcdir)/autoconf.stmp
 
 ##DOS##autoconf.h: win-mac.h
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index ebda77ec00..8c0d2362a1 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -14,9 +14,9 @@ all: env-setup.sh $(GEN_SCRIPTS)
 env-setup.sh: env-setup.stamp
 env-setup.stamp: $(srcdir)/env-setup.shin $(BUILDTOP)/config.status \
 		Makefile 
-	cd $(BUILDTOP) && \
+	(cd $(BUILDTOP) && \
 		CONFIG_FILES=$(mydir)/env-setup.sh:$(mydir)/env-setup.shin $(SHELL) \
-		config.status
+		config.status)
 	chmod +x env-setup.sh
 	touch env-setup.stamp
 
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 3b4f104e7b..6b5f1e70a1 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -221,7 +221,7 @@ do-dyn-lclint:
 
 $(BUILDTOP)/include/gssrpc/types.h: types.stamp
 types.stamp: $(top_srcdir)/include/gssrpc/types.hin $(BUILDTOP)/config.status
-	cd $(BUILDTOP) && $(SHELL) config.status include/gssrpc/types.h
+	(cd $(BUILDTOP) && $(SHELL) config.status include/gssrpc/types.h)
 	touch types.stamp
 
 clean-unix::