[SCM] live-tools branch, debian-next, updated. debian/3.0.3-1-6-gfa4a86c

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit fa4a86ca57c29baa32129e0b58b12330c12cd3d5
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 21 00:49:17 2012 +0200

    Moving executables from /usr/bin to /bin as they potentially need to be arround before /usr is available.

diff --git a/Makefile b/Makefile
index 3d19fcb..81782c5 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ build:
 
 install:
 	# Installing scripts
-	mkdir -p $(DESTDIR)/usr/bin
-	cp -r bin/* $(DESTDIR)/usr/bin
+	mkdir -p $(DESTDIR)/bin
+	cp -r bin/* $(DESTDIR)/bin
 
 	# Installing docs
 	mkdir -p $(DESTDIR)/usr/share/doc/live-tools
@@ -79,8 +79,7 @@ uninstall:
 		rm -f $(DESTDIR)/usr/$$(basename $${SCRIPT}); \
 	done
 
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/bin > /dev/null 2>&1 || true
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin > /dev/null 2>&1 || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true
 
 	# Uninstalling docs

-- 
live-tools