[or-cvs] r10441: Add some ;trues, and tabify. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-01 14:02:41 -0400 (Fri, 01 Jun 2007)
New Revision: 10441

Modified:
   tor/trunk/
   tor/trunk/src/or/Makefile.am
Log:
 r13139 at catbus:  nickm | 2007-06-01 14:02:40 -0400
 Add some ;trues, and tabify.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13139] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-06-01 17:49:37 UTC (rev 10440)
+++ tor/trunk/src/or/Makefile.am	2007-06-01 18:02:41 UTC (rev 10441)
@@ -39,41 +39,41 @@
 tor_main.o: micro-revision.i
 
 micro-revision.i: FORCE
-	@if test -d ../../.svn && test -x "`which svn 2>&1`" ; then	\
-	  svn info ../.. |              			\
+	@if test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \
+	  svn info ../.. |					\
 	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
-	     || true;                                           \
-	elif test -x "`which svk 2>&1`" && test -d ~/.svk/local; then \
-          location=../..;                                       \
-          rev=x;                                                \
-          while test x$$rev = xx; do                            \
-            x=`svk info $$location |                            \
-              sed -n 's/^Mirrored From:.*, Rev\. \([0-9][0-9]*\)/\1/p'`; \
-            if test x$$x != x; then                             \
-              rev=$$x;                                          \
-              break;                                            \
-            else                                                \
-              loc=`svk info $$location |                        \
-                sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \
-              if test x$$loc = x; then                          \
-                break;                                          \
-              else                                              \
-                location=/$$loc;                                \
-              fi;                                               \
-            fi;                                                 \
-          done;                                                 \
-          if test x$$rev != x; then                             \
-            echo \"$$rev\" > micro-revision.tmp;                \
-          fi;                                                   \
-        fi;                                                     \
-	if test ! -f micro-revision.tmp ; then                  \
-	  if test ! -f micro-revision.i ; then                  \
-	    echo '""' > micro-revision.i;                       \
-	  fi;                                                   \
-	elif test ! -f micro-revision.i ||                      \
-          test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
-	  mv micro-revision.tmp micro-revision.i;               \
-	fi
+	     || true;						\
+	elif test -x "`which svk 2>&1;true`" && test -d ~/.svk/local; then \
+	  location=../..;					\
+	  rev=x;						\
+	  while test x$$rev = xx; do				\
+	    x=`svk info $$location |				\
+	      sed -n 's/^Mirrored From:.*, Rev\. \([0-9][0-9]*\)/\1/p'`; \
+	    if test x$$x != x; then				\
+	      rev=$$x;						\
+	      break;						\
+	    else						\
+	      loc=`svk info $$location |			\
+		sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \
+	      if test x$$loc = x; then				\
+		break;						\
+	      else						\
+		location=/$$loc;				\
+	      fi;						\
+	    fi;							\
+	  done;							\
+	  if test x$$rev != x; then				\
+	    echo \"$$rev\" > micro-revision.tmp;		\
+	  fi;							\
+	fi;							\
+	if test ! -f micro-revision.tmp ; then			\
+	  if test ! -f micro-revision.i ; then			\
+	    echo '""' > micro-revision.i;			\
+	  fi;							\
+	elif test ! -f micro-revision.i ||			\
+	  test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \
+	  mv micro-revision.tmp micro-revision.i;		\
+	fi; true
 
 #Dummy target to ensure that micro-revision.i _always_ gets built.
 FORCE: