[SCM] debian-live branch, master, updated. 1.0_a48-1-27-g58c6481

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 58c648156f755d1c998c8fe4011c62059af0668d
Merge: a5b4c4bc0dcc287875def5c2181ecd5942247d38 3ef042f35ad83ac0e70d4b2de9185f4cf5c4fbf3
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 8 04:36:40 2008 +0200

    Merge commit '3ef042f35ad83ac0e70d4b2de9185f4cf5c4fbf3'

diff --combined Makefile
index fb94b4f,20d9011..1bfdc77
--- a/Makefile
+++ b/Makefile
@@@ -25,7 -25,7 +25,7 @@@ build
  install: test
  	# Installing executables
  	mkdir -p $(DESTDIR)/usr/bin
 -	cp helpers/lh* helpers/make-live $(DESTDIR)/usr/bin
 +	cp helpers/lh* $(DESTDIR)/usr/bin
  
  	# Installing shared data
  	mkdir -p $(DESTDIR)/usr/share/live-helper
@@@ -111,3 -111,11 +111,11 @@@ clean
  distclean:
  
  reinstall: uninstall install
+ 
+ po4a:
+ 	# Automatic generation of translated manpages
+ 	set -e; if [ $$(which po4a) ]; then \
+ 	  cd manpages/ ; po4a po4a/live-helper.cfg; \
+ 	else \
+ 	  echo "Please install po4a (http://po4a.alioth.debian.org/)."; \
+ 	fi;

-- 
debian-live