[SCM] live-tools branch, debian, updated. debian/3.0.4-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit a4a45a89026fd4d29ab908e90ecf78edc5f73ee3
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..5f2f812 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
@@ -76,11 +76,10 @@ uninstall:
 	# Uninstalling scripts
 	for SCRIPT in bin/*; \
 	do \
-		rm -f $(DESTDIR)/usr/$$(basename $${SCRIPT}); \
+		rm -f $(DESTDIR)/bin/$$(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