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

2.0.x compatibility.

diff --git a/ChangeLog b/ChangeLog
index 6305b0edfc8f16ecf96cd8d83d9e476b5996a5df..a59481a31b4093e6ebf62271060a590032203327 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +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.
+
 2005-02-08  Werner Lemberg  <wl@gnu.org>
 
        * mf/feta-din-code.mf: Format; clean up code.

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index d8235c0e6bb23b61693bd34318a3b8bab9021796..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
 
@@ -20,4 +24,14 @@ $(outdir)/latin1.enc: GNUmakefile
          | sed 's|/minus|/hyphen|' >> $@
        echo 'def' >> $@
 
-all: $(INSTALLATION_FILES)
+# 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)
+