X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=423d2154ca1b22c8947623843f6ac00fde5d62a5;hb=7be7302690e550aeb3090749c957545d558383e6;hp=f9e1be0cd58f2c03206a66b8feca429b6efc7ddd;hpb=869a04dc38aaf36bf6b1a3a8b226a902f3ad4f38;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index f9e1be0cd5..423d2154ca 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -35,15 +35,15 @@ include $(depth)/make/stepmake.make
 local-dist: dist-toplevel-txt-files dist-changelog
 
 dist-changelog:
-	if  test -d .git ; then \
-		git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
+	if  test -d $(top-src-dir)/.git ; then \
+		cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \
 	else \
-		cp $(srcdir)/ChangeLog $(distdir) ; \
+		cp $(top-src-dir)/ChangeLog $(distdir) ; \
 	fi
 
 default: $(outdir)/VERSION
 
-$(outdir)/VERSION: $(config_make)
+$(outdir)/VERSION: $(config_make) VERSION
 	echo $(TOPLEVEL_VERSION) > $@
 
 dist-toplevel-txt-files:
@@ -82,7 +82,9 @@ final-install:
 
 web-ext = html midi pdf png txt ly signature
 
-footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+# For docball, issue `make web CONTENT_NEGOTIATION='
+CONTENT_NEGOTIATION = --content-negotiation
+footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) $(CONTENT_NEGOTIATION)
 footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
 
 
@@ -98,7 +100,8 @@ local-WWW-post:
 
 	cd $(top-build-dir) && find Documentation input \
 		$(web-ext:%=-path '*/out-www/*.%' -or) -type l \
-		| grep -v 'lily-[0-9].*.pdf' \
+		| grep -v 'lily-[0-9a-f]*.*pdf' \
+		| grep -v '/fr/' \
 		> $(outdir)/weblist
 	ls $(outdir)/*.html >> $(outdir)/weblist
 
@@ -117,7 +120,6 @@ local-WWW-post:
 			rm -rf $$a ; \
 		done \
 	done
-	echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION
 
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
@@ -146,7 +148,7 @@ PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
+$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION 
 # Preparing LilyPond tree for build-dir exec
 	cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
 	mkdir -p $(tree-bin)
@@ -154,7 +156,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 	ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
 	mkdir -p $(tree-lib-prefix)
 	ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
-	mkdir -p $(tree-share-prefix)/dvips
 	mkdir -p $(tree-share-prefix)/elisp
 	mkdir -p $(tree-share-prefix)/fonts
 	mkdir -p $(tree-share-prefix)/fonts/otf
@@ -177,9 +178,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 		ln -s ../../../../python/$(outconfbase) python && \
 		ln -s $(top-src-dir)/scm && \
 		ln -s $(top-src-dir)/scripts scripts
-	cd $(tree-share-prefix)/dvips && \
-		ln -s ./../../../mf/$(outconfbase) mf-out && \
-		ln -s $(top-src-dir)/ps
 	cd $(tree-share-prefix)/tex && \
 		ln -s $(top-src-dir)/tex source && \
 		ln -s ../../../../../tex/$(outconfbase) tex-out && \
@@ -212,17 +210,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo
 		ln -s ../../../../../../mf/$(outconfbase)/*.pfa .
 
 TAGS.make: dummy
-	etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make')
-
-local-clean: build-dir-setup-clean local-web-clean
-
-local-web-clean:
-	rm -rf $(outdir)/web-root/
-
-
-
-build-dir-setup-clean:
-	cd $(top-build-dir) && rm -rf share
+	etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make')
 
 $(config_h): config.hh.in
 #