This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

(toplevel b-i-b patch) remove more cruft, take two


Take two, since the {} were really unneeded.  Tested on i686-pc-linux-gnu.

	* Makefile.tpl: Remove leftover support for non-autoconfiscated
	subdirectories.
	* Makefile.in: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.5.2.15
diff -u -r1.5.2.15 Makefile.tpl
--- Makefile.tpl	23 Nov 2002 22:21:46 -0000	1.5.2.15
+++ Makefile.tpl	24 Nov 2002 20:24:20 -0000
@@ -864,17 +864,10 @@
 	      srcdiroption="--srcdir=$${topdir}/[+module+]"; \
 	      libsrcdir="$$s/[+module+]"; \
 	    fi; \
-	    if [ -f $${libsrcdir}/configure ] ; then \
-	      rm -f no-such-file skip-this-dir; \
-	      CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	    rm -f no-such-file skip-this-dir; \
+	    CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 		$(BUILD_CONFIGARGS) $${srcdiroption} \
-		--with-build-subdir="$(BUILD_SUBDIR)"; \
-	    else \
-	      rm -f no-such-file skip-this-dir; \
-	      CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
-		$(BUILD_CONFIGARGS) $${srcdiroption} \
-		--with-build-subdir="$(BUILD_SUBDIR)"; \
-	    fi || exit 1; \
+		--with-build-subdir="$(BUILD_SUBDIR)" || exit 1; \
 	    if [ -f skip-this-dir ] ; then \
 	      sh skip-this-dir; \
 	      rm -f skip-this-dir; \
@@ -1034,17 +1022,10 @@
 	      srcdiroption="--srcdir=$${topdir}/[+module+]"; \
 	      libsrcdir="$$s/[+module+]"; \
 	    fi; \
-	    if [ -f $${libsrcdir}/configure ] ; then \
-	      rm -f no-such-file skip-this-dir; \
-	      CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+	    rm -f no-such-file skip-this-dir; \
+	    CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
 		$(TARGET_CONFIGARGS) $${srcdiroption} \
-		--with-target-subdir="$(TARGET_SUBDIR)"; \
-	    else \
-	      rm -f no-such-file skip-this-dir; \
-	      CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
-		$(TARGET_CONFIGARGS) $${srcdiroption} \
-		--with-target-subdir="$(TARGET_SUBDIR)"; \
-	    fi || exit 1; \
+		--with-target-subdir="$(TARGET_SUBDIR)" || exit 1; \
 	    if [ -f skip-this-dir ] ; then \
 	      sh skip-this-dir; \
 	      rm -f skip-this-dir; \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]