diff options
| author | Dan McGee <dan@archlinux.org> | 2011-12-07 19:33:41 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-12-08 16:17:39 +0100 |
| commit | 781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de (patch) | |
| tree | 4799c6842ac2d0e109313088c48f04fd03759684 /scripts/Makefile.am | |
| parent | dacda1f6b3f2122d7d54cda9ed7d620301595ef1 (diff) | |
| download | pacman-781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de.tar.gz pacman-781af8f91b5c8c6b804a0dcc0a47a7f8f018c6de.tar.xz | |
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 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d89fd306..328fbff2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -60,14 +60,10 @@ edit = sed \ ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the ## wrong file by accident. -# two 'test' lines- make sure we can handle both sh and py type scripts -# third 'test' line- make sure one of the two checks succeeded $(OURSCRIPTS): Makefile - @echo ' ' GEN $@; - @$(RM) $@ - @test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@ - @chmod +x $@ - @chmod a-w $@ + $(AM_V_at)$(RM) $@ + $(AM_V_GEN)test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@ + $(AM_V_at)chmod +x,a-w $@ makepkg: \ $(srcdir)/makepkg.sh.in \ |