X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=0dccb785d22c9096ac5471076d5a78b80e4fb77d;hb=64bb1e8b17f8223de4277881f4d9ba61481325aa;hp=5b2716a8e8ca9c4046ac2a3aadf12f57a31d5a4e;hpb=f84fa056117227739b77c1c50efc06e6ef4f32da;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5b2716a8e8..0dccb785d2 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -10,21 +10,24 @@ depth = .
 # 
 SUBDIRS = buildscripts python scripts \
 	elisp \
-	flower lily \
+	flower kpath-guile ttftool lily \
 	mf ly tex ps scm \
 	po make \
 	cygwin debian stepmake \
-	Documentation input
+	Documentation input \
+	vim 
 #
 
-SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh
-README_FILES =  ChangeLog  COPYING DEDICATION ROADMAP THANKS
+include VERSION
+package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
+
+SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile
+README_FILES = ChangeLog  COPYING DEDICATION ROADMAP THANKS HACKING
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
 IN_FILES := $(wildcard *.in)
 PATCH_FILES = emacsclient.patch server.el.patch darwin.patch
-VIM_FILES = vimrc lilypond.vim
-EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \
-  $(PATCH_FILES) $(VIM_FILES)
+EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \
+  $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES)
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)
 INSTALLATION_FILES=$(config_make) VERSION
@@ -38,33 +41,41 @@ doc:
 	$(MAKE) -C Documentation
 
 install-WWW:
-	-$(INSTALL) -m 755 -d $(webdir) 
+	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) 
 	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
+# install-WWW does not recurse; fake it visiting Documentation/user manually
+	$(MAKE) -C Documentation/user local-install-WWW
+	$(MAKE) -C Documentation/user install-info
 
 web-install:
 	$(MAKE) out=www install-WWW
 
-local-install:
-	$(INSTALL) -d $(local_lilypond_datadir)
-
-final-install:
-	@echo
-	@echo " *** Before running, buildscripts/out/lilypond-{profile,login}"
-	@echo " *** must be run. You're advised to source these scripts from your "
-	@echo " *** login scripts. For more information, see Invoking LilyPond in the manual."
-	@echo 
-
-web-ext = gz html midi pdf png txt ly
+uninstall-WWW:
+	#TODO
 
-footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+web-uninstall:
+	$(MAKE) out=www uninstall-WWW=
 
-bla:
-	cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
+local-install:
+	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
 
-local-WWW-post:  
-	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
-	cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
-	cd $(builddir) && rm -f `find . -name \*.html~ -print`
+final-install:
+	@echo '*** Before using LilyPond, the contents of one of the login scripts'
+	@echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.'
+	@echo '*** LilyPond should have been installed to do that automatically'
+	@echo '*** when you log in.  So, please log out now and log in again.'
+	@echo '*** For more information see Invoking LilyPond in the manual.'
+
+web-ext = html midi pdf png txt ly
+
+footify = $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footifymail = MAILADDRESS=bug-lilypond@gnu.org
+
+local-WWW-post:
+# need UTF8 setting in case this is hosted on a website. 
+	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(builddir)/.htaccess 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
+	cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify)
+	cd $(builddir) && find . -name \*.html~ -print | xargs rm -f
 	cd $(builddir) && find Documentation input \
 		$(web-ext:%=-path '*/out-www/*.%' -or) -false \
 		> $(outdir)/weblist
@@ -73,60 +84,66 @@ local-WWW-post:
 	cd $(builddir) && ls *.html >> $(outdir)/weblist
 	cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
 
+share-prefix = $(builddir)/share
+tree-prefix = $(builddir)/share/lilypond/$(TOPLEVEL_VERSION)
 
 src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
 
-ALL-TAGS:
-	etags $(shell find . $(src-ext:%=-name '*.%' -or) -false | grep -v '/out')
-
 web-clean:
-	$(SHELL) $(buildscript-dir)/clean-fonts.sh
 	$(MAKE) out=www clean
-	$(MAKE) $(builddir)/share/lilypond-force
-
+	$(MAKE) $(tree-prefix)/lilypond-force
 
 default: $(config_h) builddir-setup 
 
-builddir-setup: $(builddir)/share/lilypond-force
+builddir-setup: $(tree-prefix)/lilypond-force
 
 PO_FILES = $(wildcard $(srcdir)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(builddir)/share/lilypond-force:
+$(tree-prefix)/lilypond-force: GNUmakefile
 # Preparing LilyPond tree for builddir exec
 	cd $(builddir) && rm -rf lib share
-	mkdir -p $(builddir)/lib/lilypond
-	mkdir -p $(builddir)/share/lilypond
-	mkdir -p $(builddir)/share/lilypond/elisp
-	mkdir -p $(builddir)/share/lilypond/fonts
-	mkdir -p $(builddir)/share/lilypond/tex
-	cd $(builddir)/lib/lilypond && \
-		ln -s  ../../python/$(outconfbase) python
-	cd $(builddir)/share/lilypond && \
+	mkdir -p $(builddir)/lib/$(package)
+	mkdir -p $(tree-prefix)
+	mkdir -p $(tree-prefix)/dvips
+	mkdir -p $(tree-prefix)/elisp
+	mkdir -p $(tree-prefix)/fonts
+	mkdir -p $(tree-prefix)/tex
+	cd $(builddir)/lib && \
+		ln -s  ../../../python/$(outconfbase) python
+	cd $(tree-prefix) && \
 		ln -s $(abs-srcdir)/ly ly && \
-		ln -s ../../mf/$(outconfbase) dvips && \
-		ln -s ../../mf/$(outconfbase) afm && \
-		ln -s ../../mf/$(outconfbase) tfm && \
+		ln -s ../../../mf/$(outconfbase) otf && \
+		ln -s ../../../mf/$(outconfbase) svg && \
+		ln -s ../../../mf/$(outconfbase) tfm && \
 		ln -s $(abs-srcdir)/mf && \
 		ln -s $(abs-srcdir)/ps && \
-		ln -s ../../python/$(outconfbase) python && \
-		ln -s $(abs-srcdir)/scm
-	cd $(builddir)/share/lilypond/tex && \
+		ln -s ../../../python/$(outconfbase) python && \
+		ln -s $(abs-srcdir)/scm && \
+		ln -s $(abs-srcdir)/scripts scripts
+	cd $(tree-prefix)/dvips && \
+		ln -s ./../../mf/$(outconfbase) mf-out && \
+		ln -s $(abs-srcdir)/ps
+	cd $(tree-prefix)/tex && \
 		ln -s $(abs-srcdir)/tex source && \
-		ln -s ../../../mf/$(outconfbase) generate
-	cd $(builddir)/share/lilypond/fonts && \
+		ln -s ../../../../tex/$(outconfbase) tex-out && \
+		ln -s ../../../../mf/$(outconfbase) mf-out
+	cd $(tree-prefix)/fonts && \
 		ln -s $(abs-srcdir)/mf source && \
-		ln -s ../../../mf/$(outconfbase) afm && \
-		ln -s ../../../mf/$(outconfbase) tfm && \
-		ln -s ../../../mf/$(outconfbase) type1
-	cd $(builddir)/share/lilypond/elisp && \
-		ln -sf ../../../elisp/$(outconfbase)/lilypond.words.el . && \
+		ln -s ../../../../tex/$(outconfbase) enc && \
+		ln -s ../../../../mf/$(outconfbase) map && \
+		ln -s ../../../../mf/$(outconfbase) otf && \
+		ln -s ../../../../mf/$(outconfbase) tfm && \
+		ln -s ../../../../mf/$(outconfbase) svg && \
+		ln -s ../../../../mf/$(outconfbase) type1
+	cd $(tree-prefix)/elisp && \
+		ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
 		ln -s $(abs-srcdir)/elisp/*.el .
 	$(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
+		mkdir -p $(share-prefix)/locale/$i/LC_MESSAGES && \
+		cd $(share-prefix)/locale/$i/LC_MESSAGES && \
+		ln -sf ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
 	touch $@
 
 local-clean: builddir-setup-clean