X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=fb3ad034c90c218f6171f15137e7d9f642a8cba2;hb=8438b824fb221159742957c2eeab761effe73be4;hp=3aa2b41d3ea187ccd65e8c68e7ec695c42f492c5;hpb=1b4f371fe85ccdf1a5e5670cf5626426bd05d82b;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3aa2b41d3e..fb3ad034c9 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -8,9 +8,10 @@ depth = .
 
 # descent order into subdirectories
 # 
-SUBDIRS = buildscripts scripts flower lily \
+SUBDIRS = buildscripts python scripts \
+	flower lily \
 	mf ly tex ps scm \
-	python po make \
+	po make \
 	cygwin debian $(builddir)/stepmake \
 	Documentation input
 #
@@ -44,10 +45,10 @@ doc: run-reqs
 	$(MAKE) -C Documentation
 
 web-doc: web-reqs
-	$(MAKE) out=www -C input/regression/ WWW
-	$(MAKE) out=www -C input/template/ WWW
-	$(MAKE) out=www -C input/test/ WWW
-	$(MAKE) out=www -C Documentation WWW
+	$(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/regression/ WWW
+	$(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/template/ WWW
+	$(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C input/test/ WWW
+	$(MAKE) out=www LILYPOND_BOOK_FORMAT=texi-html -C Documentation WWW
 	$(MAKE) footify
 
 pfa-fonts:
@@ -125,6 +126,10 @@ default: $(config_h) builddir-setup
 
 builddir-setup: $(builddir)/share/lilypond-force
 
+PO_FILES = $(wildcard $(srcdir)/po/*.po)
+HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
+CATALOGS = $(HELP_CATALOGS:lilypond=) 
+
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
 	cd $(builddir) && rm -rf share
@@ -148,6 +153,10 @@ $(builddir)/share/lilypond-force:
 		ln -s ../../../mf/$(outconfbase) afm && \
 		ln -s ../../../mf/$(outconfbase) tfm && \
 		ln -s ../../../mf/$(outconfbase) type1
+	$(foreach i,$(CATALOGS), \
+		mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \
+		cd $(builddir)/share/locale/$i/LC_MESSAGES && \
+		ln -fs ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
 	touch $@
 
 local-clean: builddir-setup-clean
@@ -161,8 +170,8 @@ $(config_h): configure.in aclocal.m4
 # and they blindly run "cvs update; make".
 #
 	@echo
-	@echo ' *** config.h is out of date'
+	@echo ' *** $(config_h) is out of date'
 	@echo ' *** Remove it and rerun autogen:'
-	@echo '         rm config.h; ./autogen.sh'
+	@echo '         rm $(config_h); ./autogen.sh'
 	@echo
 	@false