From 143a5efdb5fcd8281aee7299af6e8d19c86e1166 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 7 Jan 2005 14:24:05 +0000
Subject: [PATCH] C

---
 ChangeLog      | 10 ++++++++++
 GNUmakefile.in |  5 ++++-
 SConstruct     |  3 ++-
 ps/GNUmakefile |  9 +++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b3d764a22..4362d3c775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-03  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	Backport teTeX-3.0 compatibility.
+	
+	* SConstruct: 
+	* ps/GNUmakefile (INSTALLATION_FILES): teTeX-3.0
+	compatibility (backportme).
+
+	* GNUmakefile.in: teTeX-3.0 compatibility (backportme).
+
 2005-01-05  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* Documentation/user/notation.itely (Setting simple songs):
diff --git a/GNUmakefile.in b/GNUmakefile.in
index c60180d4b5..a5332feaaa 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -101,6 +101,7 @@ $(builddir)/share/lilypond-force:
 	cd $(builddir) && rm -rf lib share
 	mkdir -p $(builddir)/lib/$(package)
 	mkdir -p $(builddir)/share/$(package)
+	mkdir -p $(builddir)/share/$(package)/dvips
 	mkdir -p $(builddir)/share/$(package)/elisp
 	mkdir -p $(builddir)/share/$(package)/fonts
 	mkdir -p $(builddir)/share/$(package)/tex
@@ -108,13 +109,15 @@ $(builddir)/share/lilypond-force:
 		ln -s  ../../python/$(outconfbase) python
 	cd $(builddir)/share/$(package) && \
 		ln -s $(abs-srcdir)/ly ly && \
-		ln -s ../../mf/$(outconfbase) dvips && \
 		ln -s ../../mf/$(outconfbase) afm && \
 		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/$(package)/dvips && \
+		ln -s ./../mf/$(outconfbase) mf-out && \
+		ln -s $(abs-srcdir)/ps
 	cd $(builddir)/share/$(package)/tex && \
 		ln -s $(abs-srcdir)/tex source && \
 		ln -s ../../../tex/$(outconfbase) tex-out && \
diff --git a/SConstruct b/SConstruct
index f3067fd56f..2b59c9a4ac 100644
--- a/SConstruct
+++ b/SConstruct
@@ -667,7 +667,8 @@ def symlink_tree (target, source, env):
 	      ('lily/',      'bin/lilypond-bin'),
 	      ('scripts/',   'bin/lilypond'),
 	      ('scripts/',   'bin/lilypond-book'),
-	      ('mf',         'share/lilypond/dvips'),
+	      ('mf',         'share/lilypond/dvips/mf-out'),
+	      ('#ps',        'share/lilypond/dvips/ps'),
 	      ('#ps',        'share/lilypond/tex/music-drawing-routines.ps'),
 	      ('mf',         'share/lilypond/afm'),
 	      ('mf',         'share/lilypond/tfm'),
diff --git a/ps/GNUmakefile b/ps/GNUmakefile
index 1ade515613..c57e9e6a12 100644
--- a/ps/GNUmakefile
+++ b/ps/GNUmakefile
@@ -8,4 +8,13 @@ EXTRA_DIST_FILES = $(PS_FILES)
 INSTALLATION_DIR=$(local_lilypond_datadir)/ps/
 INSTALLATION_FILES=$(PS_FILES)
 
+# teTeX-3.0 compatibility.
+local-install:
+	-$(INSTALL) -d $(local_lilypond_datadir)/dvips
+	(cd $(local_lilypond_datadir)/dvips && ln -sf ../ps .)
+
+local-uninstall:
+	-rm -f $(local_lilypond_datadir)/dvips/ps
+	-rmdir $(local_lilypond_datadir)/dvips
+
 include $(depth)/make/stepmake.make
-- 
2.39.5