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

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


The following commit has been merged in the debian branch:
commit a6cdc3f9d3665448061eb65c65aa92666d07c33b
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 19 03:35:11 2012 +0200

    Installing examples into the correct location in /usr/share/doc.

diff --git a/Makefile b/Makefile
index a1eaa84..b58e3db 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* 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/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/hooks/*
 
 all: build
 
@@ -40,7 +40,7 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live/build
-	cp -r frontends/cgi data examples functions includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
+	cp -r frontends/cgi data functions includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
 	cp -r share/* $(DESTDIR)/usr/share/live/build
 
 	# Installing executables
@@ -52,7 +52,7 @@ install:
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-build
-	cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-build
+	cp -r COPYING docs/* examples $(DESTDIR)/usr/share/doc/live-build
 
 	# Installing manpages
 	for MANPAGE in manpages/en/*; \

-- 
live-build



More information about the debian-live-changes mailing list