summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-12-07 12:33:41 -0600
committerDan McGee <dan@archlinux.org>2011-12-08 09:17:39 -0600
commit781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de (patch)
tree4799c6842ac2d0e109313088c48f04fd03759684 /etc
parentdacda1f6b3f2122d7d54cda9ed7d620301595ef1 (diff)
Use automake verbose helpers in custom make rules
This converts our script generation to use the built-in AM_V_GEN macro, which honors the V= setting passed to make and allows one to see the full command if they truly desire. The AM_V_at macro is also used in place of an explicit @ so verbose-mode compiles show all commands being run. We can also use these two macros in doc generation to quiet it down to the level we expect. Other minor changes: * a pointless test call is removed in test/pacman/tests/ * sed is used instead of dos2unix as we depend on it anyway * consecutive chmod calls are reduced to a single call (e.g., '+x,a-x') Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile.am7
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am
index d504d7fc..58a80bdc 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -22,10 +22,9 @@ edit = sed \
-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
$(dist_sysconf_DATA): Makefile
- @echo ' ' GEN $@;
- @$(RM) $@ $@.tmp
- @$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
- @mv $@.tmp $@
+ $(AM_V_at)$(RM) $@ $@.tmp
+ $(AM_V_GEN)$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+ $(AM_V_at)mv $@.tmp $@
makepkg.conf: $(srcdir)/makepkg.conf.in
pacman.conf: $(srcdir)/pacman.conf.in