From: Martin Kraemer <martin@apache.org>
Date: Mon, 13 May 2002 08:13:06 +0000 (+0000)
Subject: Fix propagation of ${OPTIM} to subdirectories (which used to work in
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=357fd409b2481205b1febad303f3f688bf6a7d6b;p=thirdparty%2Fapache%2Fhttpd.git

Fix propagation of ${OPTIM} to subdirectories (which used to work in
early 1.3's at least), so that it is possible to do a
  make OPTIM=-g
from the src/ directory to temporarily override the default
(e.g., for debugging).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@95060 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/Configure b/src/Configure
index d5b9a2076c9..fe078f7f5d6 100755
--- a/src/Configure
+++ b/src/Configure
@@ -2475,8 +2475,8 @@ all clean distclean depend ::
 	  if [ "x\$\$i" != "x" ]; then \\
 	    echo "===> \$(SDP)modules/\$\$i"; \\
 		case "x\$(OS)" in \\
-		  xOS390 | xTPF) (cd \$\$i && \$(MAKE) SDP='\$(SDP)' \$@) || exit 1;; \\
-		              *) (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1;; \\
+		  xOS390 | xTPF) (cd \$\$i && \$(MAKE) SDP='\$(SDP)' OPTIM='\$(OPTIM)' \$@) || exit 1;; \\
+		              *) (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' OPTIM='\$(OPTIM)' \$@) || exit 1;; \\
 		esac; \\
 		echo "<=== \$(SDP)modules/\$\$i"; \\
 	  fi; \\
diff --git a/src/Makefile.tmpl b/src/Makefile.tmpl
index b8aeb09ec94..e94769cbaa6 100644
--- a/src/Makefile.tmpl
+++ b/src/Makefile.tmpl
@@ -64,8 +64,8 @@ subdirs:
 	@for i in $(SUBDIRS); do \
 		echo "===> $(SDP)$$i"; \
 		case ".$(OS)" in \
-		  .OS390 | .TPF) ( cd $$i && $(MAKE) SDP='$(SDP)' ) || exit 1;; \
-		              *) ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1;; \
+		  .OS390 | .TPF) ( cd $$i && $(MAKE) SDP='$(SDP)' OPTIM='$(OPTIM)') || exit 1;; \
+		              *) ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' OPTIM='$(OPTIM)') || exit 1;; \
 		esac; \
 		echo "<=== $(SDP)$$i"; \
 	done
@@ -74,14 +74,14 @@ support: support-dir
 
 support-dir:
 	@echo "===> $(SDP)support"; \
-	cd support; $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' || exit 1; \
+	cd support; $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' OPTIM='$(OPTIM)' || exit 1; \
 	echo "<=== $(SDP)support"
 
 clean:
 	-rm -f $(TARGET) lib$(TARGET).* *.o
 	@for i in $(SUBDIRS); do \
 		echo "===> $(SDP)$$i"; \
-		( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' $@ ) || exit 1; \
+		( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' OPTIM='$(OPTIM)' $@ ) || exit 1; \
 		echo "<=== $(SDP)$$i"; \
 	done
 
@@ -116,7 +116,7 @@ depend:
 		> Makefile.tmpl \
 	    && rm Makefile.new
 	for i in $(SUBDIRS); do \
-	    ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' depend ) || exit 1; \
+	    ( cd $$i && $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)' OPTIM='$(OPTIM)' depend ) || exit 1; \
 	done
 
 #Dependencies