teTeX-3.0 fix: install .enc in fonts/enc. Add

2.0.x compatibility.

diff --git a/ChangeLog b/ChangeLog
index b01e4b26bef1d0cfa0980d2a9e5fff6da3e03b99..aa54d26aa9e9f0dc612edb6c21ef302b6e00b061 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * tex/GNUmakefile: teTeX-3.0 fix: install .enc in fonts/enc.  Add
+       2.0.x compatibility.
+
        * GNUmakefile.in ($(builddir)/share/lilypond-force): teTeX-3.0 fix:
        add enc symlink.
 

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 311a08cdcda7f86b7f39f2fd144740d2c44b67b1..623b9a0aa1c78b270d2eaf60ddacd8bdd8420210 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -2,10 +2,14 @@ depth = ..
 
 TEX_FILES = $(wildcard *.tex)  texinfo.cnf
 EXTRA_DIST_FILES = $(TEX_FILES) 
-STEPMAKE_TEMPLATES=install
+STEPMAKE_TEMPLATES=install install-out
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/tex/
-INSTALLATION_FILES=$(TEX_FILES) $(outdir)/latin1.enc  $(outdir)/music-drawing-routines.ps
+INSTALLATION_FILES=$(TEX_FILES) $(outdir)/music-drawing-routines.ps
+
+INSTALLATION_OUT_SUFFIXES=1
+INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/fonts/enc
+INSTALLATION_OUT_FILES1=$(outdir)/latin1.enc
 
 include $(depth)/make/stepmake.make
 
@@ -14,8 +18,20 @@ $(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps
        -ln $< $@
 
 $(outdir)/latin1.enc: GNUmakefile
-       echo '/ISOLatin1Encoding ' > $@ 
-       echo 'ISOLatin1Encoding pstack' | gs -sDEVICE=nullpage  -quiet -  >> $@
-       echo ' def ' >> $@
+       echo '/ISOLatin1Encoding' > $@ 
+       echo 'ISOLatin1Encoding pstack' \
+         | gs -sDEVICE=nullpage  -quiet - \
+         | sed 's|/minus|/hyphen|' >> $@
+       echo 'def' >> $@
+
+# teTeX-2.0.x compatibility.
+local-install:
+       -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/tex
+       (cd $(DESTDIR)$(local_lilypond_datadir)/tex && ln -sf ../fonts/enc .)
+
+local-uninstall:
+       -rm -f $(DESTDIR)$(local_lilypond_datadir)/tex/enc
+       -rmdir $(DESTDIR)$(local_lilypond_datadir)/tex
+
+all: $(INSTALLATION_FILES) $(INSTALLATION_OUT_FILES1)
 
-all: $(INSTALLATION_FILES)