From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-23073-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 3712 invoked by alias); 4 Mar 2003 17:36:29 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 3611 invoked from network); 4 Mar 2003 17:36:26 -0000
Received: from unknown (HELO ms-smtp-01.nyroc.rr.com) (24.92.226.148)
  by 172.16.49.205 with SMTP; 4 Mar 2003 17:36:26 -0000
Received: from doctormoo (syr-24-24-17-145.twcny.rr.com [24.24.17.145])
	by ms-smtp-01.nyroc.rr.com (8.12.5/8.12.2) with ESMTP id h24HaOb1004538;
	Tue, 4 Mar 2003 12:36:24 -0500 (EST)
Received: from neroden by doctormoo with local (Exim 3.36 #1 (Debian))
	id 18qGKt-00007U-00; Tue, 04 Mar 2003 12:36:15 -0500
Date: Tue, 04 Mar 2003 17:36:00 -0000
To: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com,
   binutils@sources.redhat.com, aoliva@redhat.com
Subject: Toplevel Makefile.tpl cleanup 2/n part three (real version)
Message-ID: <20030304173615.GA461@doctormoo>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4i
From: Nathanael Nerode <neroden@twcny.rr.com>
X-SW-Source: 2003-03/txt/msg00101.txt.bz2

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