diff options
| author | Jan Nieuwenhuizen <janneke@gnu.org> | 2005-01-03 13:07:15 +0000 |
|---|---|---|
| committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2005-01-03 13:07:15 +0000 |
| commit | e2ac00138c9e5e9df810798f0c21c49ad5f61aeb (patch) | |
| tree | ce31b73bcf0474c353157a61b1817efc092a206a | |
| parent | 71dd5f6c45009b85d2f9232d31370ee81cf21f5a (diff) | |
* SConstruct:
* ps/GNUmakefile (INSTALLATION_FILES): teTeX-3.0
compatibility (backportme).
* GNUmakefile.in: teTeX-3.0 compatibility (backportme).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | GNUmakefile.in | 5 | ||||
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | ps/GNUmakefile | 9 |
4 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-01-03 Jan Nieuwenhuizen <janneke@gnu.org> + + * SConstruct: + * ps/GNUmakefile (INSTALLATION_FILES): teTeX-3.0 + compatibility (backportme). + + * GNUmakefile.in: teTeX-3.0 compatibility (backportme). + 2005-01-03 Werner Lemberg <wl@gnu.org> Prepare glyph shapes for mf2pt1 conversion. diff --git a/GNUmakefile.in b/GNUmakefile.in index e3198a352f..2406980bb5 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -103,6 +103,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 @@ -110,7 +111,6 @@ $(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) otf && \ ln -s ../../mf/$(outconfbase) svg && \ ln -s ../../mf/$(outconfbase) tfm && \ @@ -118,6 +118,9 @@ $(builddir)/share/lilypond-force: 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 124797edaa..4e5640dff2 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/otf'), ('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 |