Re: cygwin: lilypond and tetex-3.0

[Jan Nieuwenhuizen]

Jan Nieuwenhuizen writes:

> Thanks.  Fixed in CVS, see patch below.

And for running, you also need this patch.

Jan.


Index: GNUmakefile
===================================================================
RCS file: /cvsroot/lilypond/lilypond/tex/GNUmakefile,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -p -u -p -u -r1.14 -r1.14.2.1
--- GNUmakefile 24 Oct 2004 13:47:36 -0000      1.14
+++ GNUmakefile 8 Feb 2005 15:10:33 -0000       1.14.2.1
@@ -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: $(d
        -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)


-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org