Mercurial > gub
changeset 2999:1cb4cb64ed50
resolve.
| author | hanwen <hanwen@lilypond.org> |
|---|---|
| date | Sun, 24 Dec 2006 17:14:21 +0100 |
| parents | 2a6a1fe012d6 |
| children | 94f553df0d7b |
| files | GNUmakefile |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/GNUmakefile Sun Dec 24 17:14:13 2006 +0100 +++ b/GNUmakefile Sun Dec 24 17:14:21 2006 +0100 @@ -331,7 +331,7 @@ unlocked-doc-build: unset LILYPONDPREFIX \ && $(DOC_RELOCATION) \ - make -C $(NATIVE_LILY_BUILD) \ + $(MAKE) -C $(NATIVE_LILY_BUILD) \ DOCUMENTATION=yes do-top-doc unset LILYPONDPREFIX \ && $(DOC_LIMITS) \ @@ -341,6 +341,7 @@ WEB_TARGETS="offline online" \ CPU_COUNT=$(LILYPOND_WEB_CPU_COUNT) web $(if $(DOC_BUILDNUMBER),true,false) ## check if we have a build number + $(if $(DIST_VERSION),true,false) ## check if we have a versiong number tar --exclude '*.signature' -C $(NATIVE_LILY_BUILD)/out-www/offline-root \ -cjf $(CWD)/uploads/lilypond-$(DIST_VERSION)-$(DOC_BUILDNUMBER).documentation.tar.bz2 . tar --exclude '*.signature' -C $(NATIVE_LILY_BUILD)/out-www/online-root \ @@ -374,7 +375,8 @@ $(PYTHON) test-lily/rsync-lily-doc.py --recreate \ --version-file $(NATIVE_LILY_BUILD)/out/VERSION \ --output-distance \ - $(NATIVE_LILY_SRC)/buildscripts/output-distance.py $(NATIVE_LILY_BUILD)/out-www/web-root + $(HOME)/vc/lilypond/buildscripts/output-distance.py $(NATIVE_LILY_BUILD)/out-www/web-root +# $(NATIVE_LILY_SRC)/buildscripts/output-distance.py $(NATIVE_LILY_BUILD)/out-www/web-root doc-export: $(PYTHON) test-lily/with-lock.py --skip $(DOC_LOCK) $(MAKE) unlocked-doc-export