From 656b470163be0b9f9f4bc1056cdb0585044f4ce9 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 16 Mar 2011 10:38:35 -0500
Subject: contrib/Makefile.am: don't simplify what you don't understand

This was totally screwed under a 'make distcheck' invocation. Bring it
inline with what we have (and what works!) in scripts/Makefile.am. This
was broken/introduced in commit 05f0a28932.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 contrib/Makefile.am | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 3117da8e..827d9ec0 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,11 +1,13 @@
-OURFILES = \
+OURSCRIPTS = \
 	bacman \
-	bash_completion \
 	pacdiff \
 	paclist \
 	pacscripts \
 	pacsearch \
-	wget-xdelta.sh \
+	wget-xdelta.sh
+
+OURFILES = \
+	bash_completion \
 	zsh_completion
 
 EXTRA_DIST = \
@@ -22,21 +24,29 @@ EXTRA_DIST = \
 	README
 
 # Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = $(OURFILES) *.tmp
+MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp
 
 edit = sed \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
 	-e 's|@localstatedir[@]|$(localstatedir)|g' \
 	-e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g'
 
+$(OURSCRIPTS): Makefile
+	@echo '    ' GEN $@;
+	@rm -f $@ $@.tmp
+	@$(edit) $(srcdir)/$@.in >$@.tmp
+	@chmod +x $@.tmp
+	@chmod a-w $@.tmp
+	@mv $@.tmp $@
+
 $(OURFILES): Makefile
 	@echo '    ' GEN $@;
 	@rm -f $@ $@.tmp
-	@cp -a $@.in $@.tmp
-	@$(edit) $@.in >$@.tmp
+	@$(edit) $(srcdir)/$@.in >$@.tmp
+	@chmod a-w $@.tmp
 	@mv $@.tmp $@
 
-all-am: $(OURFILES)
+all-am: $(OURSCRIPTS) $(OURFILES)
 
 bacman: $(srcdir)/bacman.in
 bash_completion: $(srcdir)/bash_completion.in
-- 
cgit v1.2.3-70-g09d2