diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2011-08-15 19:31:34 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-15 20:05:27 +0200 |
| commit | 82ffe2cbfd83ca8b5723f4ac1c35e4b9da599106 (patch) | |
| tree | 074dc114bf5dd75bf65daf5daf49c9e8d6718561 | |
| parent | 1741b5cc30119631940f7b471395765fb6fa7b0f (diff) | |
| download | pacman-82ffe2cbfd83ca8b5723f4ac1c35e4b9da599106.tar.gz pacman-82ffe2cbfd83ca8b5723f4ac1c35e4b9da599106.tar.xz | |
build-sys: always use $(RM) instead of rm -f
These are equivalent. Use the autoconf macro for consistency.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | contrib/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | etc/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 6 | ||||
| -rw-r--r-- | test/pacman/tests/Makefile.am | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 10b03a2f..be0a4ba3 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -36,7 +36,7 @@ edit = sed \ $(OURSCRIPTS): Makefile @echo ' ' GEN $@; - @rm -f $@ $@.tmp + @$(RM) $@ $@.tmp @$(edit) $(srcdir)/$@.in >$@.tmp @chmod +x $@.tmp @chmod a-w $@.tmp @@ -44,7 +44,7 @@ $(OURSCRIPTS): Makefile $(OURFILES): Makefile @echo ' ' GEN $@; - @rm -f $@ $@.tmp + @$(RM) $@ $@.tmp @$(edit) $(srcdir)/$@.in >$@.tmp @chmod a-w $@.tmp @mv $@.tmp $@ diff --git a/doc/Makefile.am b/doc/Makefile.am index d0a3eb51..a9aa78f8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -148,7 +148,7 @@ pacman.conf.5 pacman.conf.5.html: pacman.conf.5.txt libalpm.3 libalpm.3.html: libalpm.3.txt # this one is just a symlink repo-remove.8: repo-add.8 - rm -f repo-remove.8 + $(RM) repo-remove.8 $(LN_S) repo-add.8 repo-remove.8 install-data-hook: diff --git a/etc/Makefile.am b/etc/Makefile.am index 67c0e983..d504d7fc 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -23,7 +23,7 @@ edit = sed \ $(dist_sysconf_DATA): Makefile @echo ' ' GEN $@; - @rm -f $@ $@.tmp + @$(RM) $@ $@.tmp @$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp @mv $@.tmp $@ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b5767ac6..802b8f4e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -63,7 +63,7 @@ edit = sed \ # third 'test' line- make sure one of the two checks succeeded $(OURSCRIPTS): Makefile @echo ' ' GEN $@; - @rm -f $@ + @$(RM) $@ @test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@ @chmod +x $@ @chmod a-w $@ @@ -96,11 +96,11 @@ repo-add: \ $(srcdir)/library/output_format.sh repo-remove: $(srcdir)/repo-add.sh.in - rm -f repo-remove + $(RM) repo-remove $(LN_S) repo-add repo-remove repo-elephant: $(srcdir)/repo-add.sh.in - rm -f repo-elephant + $(RM) repo-elephant $(LN_S) repo-add repo-elephant install-data-hook: diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index 15720f9b..508534ac 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -18,7 +18,7 @@ edit = sed \ $(CONFTESTS): Makefile @echo ' ' GEN $@; - @rm -f $@ $@.tmp + @$(RM) $@ $@.tmp @test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true @test -f $@.tmp || false @chmod a-w $@.tmp |