AUDIT: r22453 - gnucash-docs/trunk - Makefile cleanups

[Geert Janssens]

Author: gjanssens
Date: 2012-10-27 13:04:53 -0400 (Sat, 27 Oct 2012)
New Revision: 22453
Trac: http://svn.gnucash.org/trac/changeset/22453

Modified:
   gnucash-docs/trunk/xmldocs.make
Log:
Makefile cleanups

- Use  instead of cp
- Simplify base filename extraction

BP

Modified: gnucash-docs/trunk/xmldocs.make
===================================================================
--- gnucash-docs/trunk/xmldocs.make	2012-10-26 09:03:04 UTC (rev 22452)
+++ gnucash-docs/trunk/xmldocs.make	2012-10-27 17:04:53 UTC (rev 22453)
@@ -62,14 +62,14 @@
 copy-pics:
 	$(mkinstalldirs) "$(docname)/$(figdir)"; \
 	for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) "$$file" "$(docname)/$(figdir)/$$basefile"; \
 	done
 
 copy-style:
 	$(mkinstalldirs) "$(docname)/stylesheet"; \
 	for file in $(styledir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) "$$file" "$(docname)/stylesheet/$$basefile"; \
 	done
 
@@ -101,20 +101,20 @@
 	    $(mkinstalldirs) "$(distdir)/$(figdir)"; \
 	fi;
 	for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) "$$file" "$(distdir)/$(figdir)/$$basefile"; \
 	done
 
 install-data-local:
 	$(mkinstalldirs) "$(DESTDIR)$(docdir)";
 	for file in $(xml_files); do \
-	    cp "$(srcdir)/$$file" "$(DESTDIR)$(docdir)"; \
+	    $(INSTALL_DATA) "$(srcdir)/$$file" "$(DESTDIR)$(docdir)/$$file"; \
 	done
 	if test "$(figdir)"; then \
 	    $(mkinstalldirs) "$(DESTDIR)$(docdir)/$(figdir)"; \
 	fi;
 	for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$(figdir)/$$basefile"; \
 	done
 
@@ -124,17 +124,17 @@
 install-html: html
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/$(docname);\
 	for file in $(docname)/*.html; do\
-	    basefile=`echo $$file | sed -e 's,^.*/,,'`;\
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(docname)/$$basefile;\
 	done
 	$(mkinstalldirs) "$(DESTDIR)$(docdir)/$(docname)/$(figdir)"; \
 	for file in $(docname)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$(docname)/$(figdir)/$$basefile"; \
 	done
 	$(mkinstalldirs) "$(DESTDIR)$(docdir)/$(docname)/stylesheet"; \
 	for file in $(styledir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	    basefile=`basename $$file`; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(docdir)/$(docname)/stylesheet/$$basefile"; \
 	done
 
@@ -143,23 +143,23 @@
 uninstall-local-doc:
 	-if test "$(figdir)"; then \
 	    for file in $(srcdir)/$(figdir)/*.png; do \
-	        basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	        basefile=`basename $$file`; \
 	        rm -f "$(DESTDIR)$(docdir)/$(figdir)/$$basefile"; \
 	    done \
 	fi;
 	-if test "$(figdir)"; then \
 	    for file in $(srcdir)/$(figdir)/*.png; do \
-	        basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	        basefile=`basename $$file`; \
 	        rm -f "$(DESTDIR)$(docdir)/$(docname)/$(figdir)/$$basefile"; \
 	    done \
 	fi;
 	-if test "$(docname)"; then \
 	    for file in $(styledir)/*.png; do \
-	        basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	        basefile=`basename $$file`; \
 	        rm -f "$(DESTDIR)$(docdir)/$(docname)/stylesheet/$$basefile"; \
 	    done; \
 	    for file in $(srcdir)/$(docname)/*.html; do \
-	        basefile=`echo $$file | sed -e  's,^.*/,,'`; \
+	        basefile=`basename $$file`; \
 	        rm -f "$(DESTDIR)$(docdir)/$(docname)/$$basefile"; \
 	    done \
 	fi;