changeset 2454:9e6cba58eb93

LILYPOND_CVS_REPODIR variable. Use for set-installer-version
author hanwen <hanwen@lilypond.org>
date Mon, 23 Oct 2006 18:58:58 +0100
parents 90e0d388dbf4
children ccaa7438b8e7
files GNUmakefile
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Mon Oct 23 18:58:29 2006 +0100
+++ b/GNUmakefile	Mon Oct 23 18:58:58 2006 +0100
@@ -12,7 +12,8 @@
 ALL_PLATFORMS=arm cygwin darwin-ppc darwin-x86 debian freebsd4-x86 freebsd6-x86 linux-x86 linux-64 mingw mipsel
 PLATFORMS=darwin-ppc darwin-x86 mingw linux-x86 linux-64 freebsd-x86 cygwin
 
-LILYPOND_CVSDIR=downloads/lilypond.cvs/$(BRANCH)/
+LILYPOND_CVS_REPODIR=downloads/lilypond.cvs/
+LILYPOND_CVSDIR=$(LILYPOND_CVS_REPODIR)/$(BRANCH)/
 LILYPOND_GITDIR=downloads/lilypond.git/
 LILYPOND_BRANCH=$(BRANCH)
 
@@ -70,7 +71,7 @@
 LILYPOND_VERSION=$(shell cat VERSION)
 VERSION:
 	PATH=$(CWD)/target/local/system/usr/bin/:$(PATH) \
-		$(PYTHON) test-lily/set-installer-version.py $(LILYPOND_GITDIR) $(LILYPOND_CVSDIR)
+		$(PYTHON) test-lily/set-installer-version.py --branch $(LILYPOND_BRANCH) $(LILYPOND_GITDIR) $(LILYPOND_CVSDIR)
 
 UPDATE-BUILDNUMBER=echo 'INSTALLER_BUILD='`python lilypondorg.py nextbuild $(LILYPOND_VERSION)` > $(BUILDNUMBER_FILE)