Toplevel Makefile.tpl cleanup 2/n part three (real version)
Nathanael Nerode
neroden@twcny.rr.com
Tue Mar 4 17:36:00 GMT 2003
This was supposed to be cleanup 2/n part three.
It eliminates an 'if' in favor of an '||'.
* Makefile.tpl: Simplify logic.
* Makefile.in: Regenerate.
--- Makefile.tpl 2003-03-04 12:34:09.000000000 -0500
+++ Makefile.tpl.new 2003-03-04 12:33:49.000000000 -0500
@@ -848,12 +848,10 @@
esac; \
if [ "$(srcdir)" = "." ] ; then \
if [ "$(BUILD_SUBDIR)" != "." ] ; then \
- if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
- if [ -f Makefile ]; then \
- $(MAKE) distclean || exit 1; \
- fi; \
- else \
- exit 1; \
+ $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" \
+ || exit 1; \
+ if [ -f Makefile ]; then \
+ $(MAKE) distclean || exit 1; \
fi; \
fi; \
srcdiroption="--srcdir=."; \
@@ -1030,12 +1028,10 @@
esac; \
if [ "$(srcdir)" = "." ] ; then \
if [ "$(TARGET_SUBDIR)" != "." ] ; then \
- if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
- if [ -f Makefile ]; then \
- $(MAKE) distclean || exit 1; \
- fi; \
- else \
- exit 1; \
+ $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" \
+ || exit 1; \
+ if [ -f Makefile ]; then \
+ $(MAKE) distclean || exit 1; \
fi; \
fi; \
srcdiroption="--srcdir=."; \
More information about the Binutils
mailing list