Toplevel Makefile.tpl cleanup 2/n part three (real version)

Toplevel Makefile.tpl cleanup 2/n part three (real version)

[Nathanael Nerode]

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=."; \

Re: Toplevel Makefile.tpl cleanup 2/n part three (real version)

[Alexandre Oliva]

On Mar  4, 2003, Nathanael Nerode <neroden@twcny.rr.com> wrote:

> It eliminates an 'if' in favor of an '||'.

Even though I like this style, I find people don't find it as clear as
an explicit if.  I won't oppose this patch, but take this into account
when deciding whether to actually put this in and proposing similar
patches.

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer