From: Brian J. Murrell <brian@whamcloud.com>
Date: Tue, 29 Mar 2011 17:32:04 +0000 (-0400)
Subject: LU-53 run autogen if a Makefile.am is patched
X-Git-Tag: 1.8.5.56~44
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5d64436f79a91bdd5b4a43211295e2691e83860f;p=fs%2Flustre-release.git

LU-53 run autogen if a Makefile.am is patched

Signed-off-by: Brian J. Murrell <brian@whamcloud.com>
Change-Id: I40eb3cecff64a62c2eca212ed19263128ad4b50d
---

diff --git a/debian/rules b/debian/rules
index 06ef5af..09da1a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,12 @@ autogen-stamp: patch-stamp
 	#  needed autogen.sh scripts
 	#  see https://bugzilla.lustre.org/attachment.cgi?id=27156
 	#  for an example)
-	if grep -e "^--- .*\/autoconf" -e ".*\/configure\.ac" -e ".*\/configure\.in" debian/patches/*; then \
+	if grep -e "^--- .*\/autoconf" \
+		-e "^--- .*\/autoMakefile\.am" \
+		-e "^--- .*\/Makefile\.am" \
+		-e ".*\/configure\.ac" \
+		-e ".*\/configure\.in" \
+		debian/patches/*; then \
 		if [ ! -f build/autogen.sh ]; then \
 			echo "You have patches which require autogen.sh to be run, but it doesn't exist"; \
 			echo "Please see https://bugzilla.lustre.org/attachment.cgi?id=27156"; \