CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/29 11:53:31
Modified files:
linux/autopackage: ChangeLog GNUmakefile README
linux/autopackage/specs/ghostscript: default.apspec.in
Log message:
($(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz):
SRCDIR iso. SOURCEDIR
include local.make.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/ChangeLog.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/GNUmakefile.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/README.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/linux/autopackage/specs/ghostscript/default.apspec.in.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: installers/linux/autopackage/ChangeLog
diff -u installers/linux/autopackage/ChangeLog:1.15
installers/linux/autopackage/ChangeLog:1.16
--- installers/linux/autopackage/ChangeLog:1.15 Mon Jun 27 07:50:52 2005
+++ installers/linux/autopackage/ChangeLog Wed Jun 29 11:53:30 2005
@@ -1,5 +1,16 @@
-2005-06-27 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+2005-06-29 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * GNUmakefile
+ ($(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz):
+ SRCDIR iso. SOURCEDIR
+ include local.make.
+
+2005-06-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * GNUmakefile (src/ghostscript-8.15/.stamp): typo: $@ <-> @
+
+2005-06-27 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
* specs/lilypond/GNUmakefile: Run intltool-merge -q, report bug.
2005-06-15 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: installers/linux/autopackage/GNUmakefile
diff -u installers/linux/autopackage/GNUmakefile:1.12
installers/linux/autopackage/GNUmakefile:1.13
--- installers/linux/autopackage/GNUmakefile:1.12 Sun Jun 26 09:56:51 2005
+++ installers/linux/autopackage/GNUmakefile Wed Jun 29 11:53:30 2005
@@ -14,8 +14,15 @@
packages = pango glib ghostscript libpng lilypond
+
LILYPOND_SRCDIR = $(HOME)/cvs/savannah/lilypond/lilypond
+
+# override variables
+include local.make
+
include $(LILYPOND_SRCDIR)/VERSION
+
+
lilypond-version=$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
# FIXME: Dependencies of included packages, ie ghostscript.x86.package
@@ -78,7 +85,7 @@
wget -P downloads
http://ftp.sunsite.dk/projects/autopackage/$(autopackage-version)/$(notdir $@)
$(LILYPOND_SRCDIR)/out/lilypond-$(lilypond-version).tar.gz:
- cd $(LILYPOND_SOURCEDIR) && make dist
+ cd $(LILYPOND_SRCDIR) && make dist
uploads/.stamp:
mkdir -p uploads/
@@ -112,12 +119,12 @@
src/ghostscript-8.15/.stamp: downloads/ghostscript-8.15.tar.gz
mkdir -p src
tar -C src -xzf $<
- cp downloads/ghostscript-fonts-std-8.11.tar.gz $(dir @)
+ cp downloads/ghostscript-fonts-std-8.11.tar.gz $(dir $@)
touch $@
specs/%/default.apspec.in:
test -l specs/$(shell basename $(shell dirname $@)) || cd specs && ln
-sf $(shell echo $(shell basename $(shell dirname $@)) | sed -e s'/-.*//')
$(shell basename $(shell dirname $@))
-
+
src/%/autopackage/default.apspec.in: specs/%/default.apspec.in
rm -rf $(dir $@)
mkdir -p $(dir $@)
Index: installers/linux/autopackage/README
diff -u installers/linux/autopackage/README:1.1
installers/linux/autopackage/README:1.2
--- installers/linux/autopackage/README:1.1 Sun Jun 26 13:39:29 2005
+++ installers/linux/autopackage/README Wed Jun 29 11:53:30 2005
@@ -12,6 +12,8 @@
* build autopackages
+* Override any host-specific settings in local.make
+
UPGRADING
Make sure that all previous autopackage stuff is removed. If not,
Index: installers/linux/autopackage/specs/ghostscript/default.apspec.in
diff -u installers/linux/autopackage/specs/ghostscript/default.apspec.in:1.8
installers/linux/autopackage/specs/ghostscript/default.apspec.in:1.9
--- installers/linux/autopackage/specs/ghostscript/default.apspec.in:1.8
Fri Jun 10 08:27:56 2005
+++ installers/linux/autopackage/specs/ghostscript/default.apspec.in Wed Jun
29 11:53:31 2005
@@ -46,6 +46,7 @@
# FIXME: ghostscript-$SOFTWAREVERSION does not ship fonts, is this the right
way?
mkdirs $build_root/share/ghostscript/$SOFTWAREVERSION
+
tar -C $build_root/share/ghostscript/$SOFTWAREVERSION -xzf
ghostscript-fonts-std-8.11.tar.gz
[BuildUnprepare]
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
