[SCM] live-build branch, debian-next, updated. debian/3.0_a52-1-3-g2d16c7e
Daniel Baumann
daniel at debian.org
Thu Jul 19 00:59:22 UTC 2012
The following commit has been merged in the debian-next branch:
commit 2d16c7e2585c52d2c5eb10c19a5f4c8a066192db
Author: Daniel Baumann <daniel at debian.org>
Date: Thu Jul 19 02:59:55 2012 +0200
Moving scripts from /usr/share/live to /usr/lib/live for consistency with all debian-live packages.
diff --git a/Makefile b/Makefile
index 6164887..a1eaa84 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,16 @@ build:
install:
# Installing shared data
mkdir -p $(DESTDIR)/usr/share/live/build
- cp -r frontends/cgi data examples functions scripts includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
+ cp -r frontends/cgi data examples functions includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
cp -r share/* $(DESTDIR)/usr/share/live/build
# Installing executables
mkdir -p $(DESTDIR)/usr/bin
cp -a bin/* $(DESTDIR)/usr/bin
+ mkdir -p $(DESTDIR)/usr/lib/live
+ cp -a scripts/* $(DESTDIR)/usr/lib/live
+
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-build
cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-build
diff --git a/bin/lb b/bin/lb
index 2f23203..6c92b74 100755
--- a/bin/lb
+++ b/bin/lb
@@ -11,7 +11,12 @@
set -e
# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+if [ -e "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh ]
+then
+ . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
+else
+ . /usr/lib/live/build.sh
+fi
# Setting static variables
DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@@ -56,9 +61,9 @@ case "${1}" in
if [ -x "${LB_BASE}/scripts/build/${COMMAND}" ]
then
SCRIPT="${LB_BASE}/scripts/build/${COMMAND}"
- elif [ -x /usr/share/live/build/scripts/build/${COMMAND} ]
+ elif [ -x /usr/lib/live/build/${COMMAND} ]
then
- SCRIPT=/usr/share/live/build/scripts/build/"${COMMAND}"
+ SCRIPT=/usr/lib/live/build/"${COMMAND}"
elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
then
SCRIPT="${COMMAND}"
--
live-build
More information about the debian-live-changes
mailing list