Mercurial > gub

changeset 5881:78bebeea387c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Keep branch name for lilypond-installer.
author Graham Percival <graham@percival-music.ca>
date Tue, 12 Jan 2010 16:10:01 +0000
parents 8cd52860b992
children
files gub.make lilypond.make
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gub.make	Tue Jan 12 16:11:38 2010 +0000
+++ b/gub.make	Tue Jan 12 16:10:01 2010 +0000
@@ -66,7 +66,7 @@
 	$(foreach p,$(PLATFORMS),$(call INVOKE_INSTALLER_BUILDER,$(p)) $(INSTALL_PACKAGE) && ) :
 
 lilypond-installers: packages
-	$(foreach p,$(PLATFORMS),$(call INVOKE_GUB,$(p)) $(INSTALL_PACKAGE)-installer && ) :
+	$(foreach p,$(PLATFORMS),$(call INVOKE_GUB,$(p)) $(INSTALL_PACKAGE) && ) :
 
 platforms: $(PLATFORMS)
 
--- a/lilypond.make	Tue Jan 12 16:11:38 2010 +0000
+++ b/lilypond.make	Tue Jan 12 16:10:01 2010 +0000
@@ -45,8 +45,9 @@
 LILYPOND_DIRRED_BRANCH=$(shell $(PYTHON) gub/repository.py --branch-dir '$(LILYPOND_SOURCE_URL)')
 LILYPOND_FLATTENED_BRANCH=$(shell $(PYTHON) gub/repository.py --full-branch-name '$(LILYPOND_SOURCE_URL)')
 BUILD_PACKAGE='$(LILYPOND_SOURCE_URL)'
-INSTALL_PACKAGE = lilypond
 
+# these keep the git branch name when making packages
+INSTALL_PACKAGE=$(subst lilypond,lilypond-installer,$(BUILD_PACKAGE))
 DOC_PACKAGE=$(subst lilypond,lilypond-doc,$(BUILD_PACKAGE))
 TEST_PACKAGE=$(subst lilypond,lilypond-test,$(BUILD_PACKAGE))