(toplevel b-i-b patch) Remove more cruft, take three
Nathanael Nerode
neroden@twcny.rr.com
Tue Nov 26 08:04:00 GMT 2002
Take three, incorporating Alex's suggestion. 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.16
diff -u -r1.5.2.16 Makefile.tpl
--- Makefile.tpl 26 Nov 2002 14:27:08 -0000 1.5.2.16
+++ Makefile.tpl 26 Nov 2002 14:29:11 -0000
@@ -864,17 +864,11 @@
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 \
- $(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; \
+ rm -f no-such-file skip-this-dir || : ; \
+ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(BUILD_CONFIGARGS) $${srcdiroption} \
+ --with-build-subdir="$(BUILD_SUBDIR)" \
+ || exit 1; \
if [ -f skip-this-dir ] ; then \
sh skip-this-dir; \
rm -f skip-this-dir; \
@@ -1029,17 +1023,11 @@
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 \
- $(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; \
+ rm -f no-such-file skip-this-dir || : ; \
+ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ $(TARGET_CONFIGARGS) $${srcdiroption} \
+ --with-target-subdir="$(TARGET_SUBDIR)" \
+ || exit 1; \
if [ -f skip-this-dir ] ; then \
sh skip-this-dir; \
rm -f skip-this-dir; \
More information about the Gcc-patches
mailing list