Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-16 10:38:35 -0500
committerDan McGee <dan@archlinux.org>2011-03-16 10:38:35 -0500
commit656b470163be0b9f9f4bc1056cdb0585044f4ce9 (patch)
treed6ab30afa1b83ed95d29baf81111999ce8f99889
parent9ae6ee0f09e2fce0cf1fa128d687e286bd22798d (diff)
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>
-rw-r--r--contrib/Makefile.am24
1 files 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