From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Wed, 11 Nov 2009 11:44:58 +0000 (+0100)
Subject: Style Makefile.am to use  instead of @AUTOMAKEVAR
X-Git-Tag: SQUID_3_2_0_1~586
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cd09bae49d92b90a1e02d0f34e0714878311958;p=thirdparty%2Fsquid.git

Style Makefile.am to use  instead of @AUTOMAKEVAR

@AUTOMAKEVAR@ is troublesome when used in \ constructs as it may expand
to empty and the last line in a \ construct must not be empty or some
make versions will fail.

thankfully automake adds all variables for us, so using
is preferred.
---

diff --git a/scripts/srcformat.sh b/scripts/srcformat.sh
index 659c8a4c5d..ae031c65f6 100755
--- a/scripts/srcformat.sh
+++ b/scripts/srcformat.sh
@@ -36,8 +36,16 @@ for FILENAME in `ls -1`; do
 		else
 			rm $FILENAME.astylebak
 		fi
-		continue;
+		continue
         fi
+	;;
+
+    Makefile.am)
+
+    	perl -i -p -e 's/@([A-Z0-9_]+)@/\$($1)/g' <${FILENAME} >${FILENAME}.styled
+	mv ${FILENAME}.styled ${FILENAME}
+	;;
+
     esac
 
     if test -d $FILENAME ; then