Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / tex / GNUmakefile

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 706184ee68b2e4ce92897b696831fdb79504ddf7..5fa66c910f3f1f752e8ddf2c5fe8177766736db8 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,22 +1,18 @@
 depth = ..
 
-TEX_FILES = $(wildcard *.tex)  
+TEXINFO_FILES = texinfo.tex $(call src-wildcard,txi-*.tex)
+TEX_FILES = $(filter-out $(TEXINFO_FILES),$(call src-wildcard,*.tex))
+EXTRA_DIST_FILES = $(TEX_FILES) $(TEXINFO_FILES)
+STEPMAKE_TEMPLATES = install install-out
 
-EXTRA_DIST_FILES = $(TEX_FILES) latin1.enc
-STEPMAKE_TEMPLATES=install
-
-INSTALLATION_DIR=$(local_lilypond_datadir)/tex/
-INSTALLATION_FILES=$(TEX_FILES) $(outdir)/latin1.enc  $(outdir)/music-drawing-routines.ps
+INSTALLATION_DIR = $(local_lilypond_datadir)/tex
+INSTALLATION_FILES = $(TEX_FILES)
 
 include $(depth)/make/stepmake.make
 
-$(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps
-       rm -f $@
-       -ln $< $@
-
-$(outdir)/latin1.enc: GNUmakefile
-       echo '/ISOLatin1Encoding ' > $@ 
-       echo 'ISOLatin1Encoding pstack' | gs -quiet -  >> $@
-       echo ' def ' >> $@
+local-uninstall:
+       -rmdir $(DESTDIR)$(local_lilypond_datadir)/tex
 
 all: $(INSTALLATION_FILES)
+
+local-WWW-1: $(outdir)/lilypond.map