[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-44-g02e3ff3

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 02e3ff3ef7143d509a2e86e6736bfa21106ba725
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Apr 26 09:11:42 2009 +0200

    Cleaning up makefile.

diff --git a/Makefile b/Makefile
index 75d2bbb..da9fdcb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,24 @@
 # Makefile
 
+SHELL := sh -e
+
 #TRANSLATIONS="de"
 
-all: build
+all: test install
 
 test:
 	# Checking for syntax errors
-	set -e; for SCRIPT in functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
+	for SCRIPT in functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
 	do \
 		sh -n $$SCRIPT; \
 	done
 
 	# Checking for bashisms
-	set -e; if [ -x /usr/bin/checkbashisms ]; \
+	if [ -x /usr/bin/checkbashisms ]; \
 	then \
 		checkbashisms functions.sh functions/* examples/*/*.sh helpers/* hooks/*; \
 	else \
-		echo "bashism test skipped - you need to install devscripts."; \
+		echo "WARNING: skipping bashism test - you need to install devscripts.";
 	fi
 
 build:
@@ -36,25 +38,25 @@ install:
 	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-helper
 
 	# Installing manpages
-	set -e; for MANPAGE in manpages/*.en.1; \
+	for MANPAGE in manpages/*.en.1; \
 	do \
-		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1; \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man1/$$(basename $$MANPAGE .en.1).1; \
 	done
 
-	set -e; for MANPAGE in manpages/*.en.7; \
+	for MANPAGE in manpages/*.en.7; \
 	do \
-		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7; \
+		install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/man7/$$(basename $$MANPAGE .en.7).7; \
 	done
 
-	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
+	for TRANSLATIONS in $$TRANSLATIONS; \
 	do \
 		for MANPAGE in manpages/*.$$TRANSLATION.1; \
 		do \
-			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1; \
+			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/$$(basename $$MANPAGE .$$TRANSLATION.1).1; \
 		done; \
 		for MANPAGE in manpages/*.$$TRANSLATION.7; \
 		do \
-			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7; \
+			install -D -m 0644 $$MANPAGE $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/$$(basename $$MANPAGE .$$TRANSLATION.7).7; \
 		done; \
 	done
 
@@ -65,7 +67,7 @@ uninstall:
 	# Uninstalling executables
 	for HELPER in helpers/*; \
 	do \
-		rm -f $(DESTDIR)/usr/bin/`basename $$HELPER`; \
+		rm -f $(DESTDIR)/usr/bin/$$(basename $$HELPER); \
 	done
 
 	# Uninstalling shared data
@@ -75,37 +77,28 @@ uninstall:
 	rm -rf $(DESTDIR)/usr/share/doc/live-helper
 
 	# Uninstalling manpages
-	set -e; for MANPAGE in manpages/*.en.1; \
+	for MANPAGE in manpages/*.en.1; \
 	do \
-		rm -f $(DESTDIR)/usr/share/man/man1/`basename $$MANPAGE .en.1`.1*; \
+		rm -f $(DESTDIR)/usr/share/man/man1/$$(basename $$MANPAGE .en.1).1*; \
 	done
 
-	set -e; for MANPAGE in manpages/*.en.7; \
+	for MANPAGE in manpages/*.en.7; \
 	do \
-		rm -f $(DESTDIR)/usr/share/man/man7/`basename $$MANPAGE .en.7`.7*; \
+		rm -f $(DESTDIR)/usr/share/man/man7/$$(basename $$MANPAGE .en.7).7*; \
 	done
 
-	set -e; for TRANSLATIONS in $$TRANSLATIONS; \
+	for TRANSLATIONS in $$TRANSLATIONS; \
 	do \
 		for MANPAGE in manpages/*.$$TRANSLATION.1; \
 		do \
-			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/`basename $$MANPAGE .$$TRANSLATION.1`.1*; \
+			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man1/$$(basename $$MANPAGE .$$TRANSLATION.1).1*; \
 		done; \
 		for MANPAGE in manpages/*.$$TRANSLATION.7; \
 		do \
-			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/`basename $$MANPAGE .$$TRANSLATION.7`.7*; \
+			rm -f $(DESTDIR)/usr/share/man/$$TRANSLATION/man7/$$(basename $$MANPAGE .$$TRANSLATION.7).7*; \
 		done; \
 	done
 
-update:
-	set -e; for FILE in functions.sh functions/*.sh examples/cron/*.sh manpages/*.en.*; \
-	do \
-		sed -i	-e 's/2007\\-11\\-26/2007\\-12\\-03/' \
-			-e 's/26.11.2007/03.12.2007/' \
-			-e 's/1.0~a38/1.0~a39/' \
-		$$FILE; \
-	done
-
 clean:
 
 distclean:
@@ -114,8 +107,10 @@ reinstall: uninstall install
 
 po4a:
 	# Automatic generation of translated manpages
-	set -e; if [ $$(which po4a) ]; then \
-	  cd manpages/ ; po4a po4a/live-helper.cfg; \
+	if [ $$(which po4a) ]; \
+	then \
+		cd manpages; \
+		po4a po4a/live-helper.cfg; \
 	else \
-	  echo "Please install po4a (http://po4a.alioth.debian.org/)."; \
-	fi;
+		echo "ERROR: skipping po generation - you need to install po4a <http://po4a.alioth.debian.org/>."; \
+	fi

-- 
Debian Live build scripts