[SCM] live-build branch, debian, updated. debian/3.0_a53-1

Daniel Baumann daniel at debian.org
Thu Jul 19 02:17:54 UTC 2012


The following commit has been merged in the debian branch:
commit 5816e7afe0d8187b4ffd627689e1aa427a1c1fc8
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 19 02:53:28 2012 +0200

    Moving main executables away from scripts subdirectory.

diff --git a/Makefile b/Makefile
index bd2fc45..6164887 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = frontends/cgi/live-build-cgi frontends/cgi/live-build-cgi.cron functions/* examples/*/*.sh examples/auto/* scripts/*.sh scripts/*/* share/hooks/*
+SCRIPTS = bin/* frontends/cgi/live-build-cgi frontends/cgi/live-build-cgi.cron functions/* examples/*/*.sh examples/auto/* scripts/*.sh scripts/*/* share/hooks/*
 
 all: build
 
@@ -45,7 +45,7 @@ install:
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	mv $(DESTDIR)/usr/share/live/build/scripts/build/lb $(DESTDIR)/usr/share/live/build/scripts/build/live-build $(DESTDIR)/usr/bin
+	cp -a bin/* $(DESTDIR)/usr/bin
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-build
diff --git a/scripts/build/lb b/bin/lb
similarity index 100%
rename from scripts/build/lb
rename to bin/lb
diff --git a/scripts/build/live-build b/bin/live-build
similarity index 100%
rename from scripts/build/live-build
rename to bin/live-build

-- 
live-build



More information about the debian-live-changes mailing list