[Pkg-privacy-commits] [libgsecuredelete] 04/12: Fix build system portability

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to annotated tag 0.2.1
in repository libgsecuredelete.

commit f401baf4882ca65f2abd6a4d8b7341fef0bb701f
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Thu Jan 16 02:46:08 2014 +0100

    Fix build system portability
    
    * $< is only portable in a suffix rule;
    * $(RM) isn't defined by Autoconf/Automake and isn't portable.
      Use plain `rm -f` since it's what Autoconf suggests.
---
 Makefile.am      |  2 +-
 docs/Makefile.am | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8de248e..e313dd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,5 +23,5 @@ compile_script = $(SED) -e 's%[@]SRM_PATH[@]%$(SRM_PATH)%g' \
 
 gsd-sfill-helper: gsd-sfill-helper.in Makefile
 	$(AM_V_GEN) \
-	$(compile_script) < $(srcdir)/$< > $@ && \
+	$(compile_script) < $(srcdir)/gsd-sfill-helper.in > $@ && \
 	chmod +x $@
diff --git a/docs/Makefile.am b/docs/Makefile.am
index b9166ce..c4076e5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -28,21 +28,21 @@ VALADOC_FLAGS = --no-protected \
 # produce wrong results, e.g. if a file got renamed.
 
 html: $(valadoc_sources)
-	$(RM) -r $@
+	rm -f -r $@
 	$(VALADOC) \
 		-o $@ \
 		--doclet html \
 		$(VALADOC_FLAGS)
 
 devhelp: $(valadoc_sources)
-	$(RM) -r $@
+	rm -f -r $@
 	$(VALADOC) \
 		-o $@ \
 		--doclet devhelp \
 		$(VALADOC_FLAGS)
 
 gtkdoc: $(valadoc_sources)
-	$(RM) -r $@
+	rm -f -r $@
 	$(VALADOC) \
 		-X -l -X $(top_builddir)/gsecuredelete/.libs/libgsecuredelete.so \
 		-X $(top_srcdir)/gsecuredelete/gsecuredelete.h \
@@ -52,10 +52,10 @@ gtkdoc: $(valadoc_sources)
 
 
 clean-local:
-	$(RM) -r html devhelp gtkdoc
+	rm -f -r html devhelp gtkdoc
 
 uninstall-doc-devhelp:
-	$(RM) -r $(DESTDIR)$(datadir)/devhelp/books/$(DOC_NAME)
+	rm -f -r $(DESTDIR)$(datadir)/devhelp/books/$(DOC_NAME)
 
 install-doc-devhelp: devhelp
 	$(MKDIR_P) $(DESTDIR)$(datadir)/devhelp/books/$(DOC_NAME)/img
@@ -63,7 +63,7 @@ install-doc-devhelp: devhelp
 	$(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/$(DOC_NAME)/img devhelp/$(DOC_NAME)/img/*
 
 uninstall-doc-gtkdoc:
-	$(RM) -r $(DESTDIR)$(datadir)/gtk-doc/html/$(DOC_NAME)
+	rm -f -r $(DESTDIR)$(datadir)/gtk-doc/html/$(DOC_NAME)
 
 install-doc-gtkdoc: gtkdoc
 	$(MKDIR_P) $(DESTDIR)$(datadir)/gtk-doc/html/$(DOC_NAME)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/libgsecuredelete.git