From 25d47840582d52b9412bdb5a149da49aab25c25e Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 16 Mar 2005 09:05:41 +0000
Subject: [PATCH] * HACKING (datadir): Add VERSION.

* GNUmakefile.in (linktree): Bugfix: outconfdirs are one dir
higher up.
---
 ChangeLog      |  9 +++++++++
 GNUmakefile.in | 34 +++++++++++++++++-----------------
 HACKING        |  8 +++++++-
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed31435df8..5824521ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-16  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	Builddir run fixes.
+
+	* HACKING (datadir): Add VERSION.
+
+	* GNUmakefile.in (linktree): Bugfix: outconfdirs are one dir
+	higher up.
+
 2005-03-15  Werner Lemberg  <wl@gnu.org>
 
 	* mf/feta-klef.mf (draw_gclef): Move z10' slightly so that the
diff --git a/GNUmakefile.in b/GNUmakefile.in
index ed8b67ea45..0cccc3a108 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -102,7 +102,7 @@ PO_FILES = $(wildcard $(srcdir)/po/*.po)
 HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%)
 CATALOGS = $(HELP_CATALOGS:lilypond=) 
 
-$(tree-prefix)/lilypond-force:
+$(tree-prefix)/lilypond-force: GNUmakefile
 # Preparing LilyPond tree for builddir exec
 	cd $(builddir) && rm -rf lib share
 	mkdir -p $(builddir)/lib/$(package)
@@ -112,38 +112,38 @@ $(tree-prefix)/lilypond-force:
 	mkdir -p $(tree-prefix)/fonts
 	mkdir -p $(tree-prefix)/tex
 	cd $(builddir)/lib && \
-		ln -s  ../../python/$(outconfbase) python
+		ln -s  ../../../python/$(outconfbase) python
 	cd $(tree-prefix) && \
 		ln -s $(abs-srcdir)/ly ly && \
-		ln -s ../../mf/$(outconfbase) otf && \
-		ln -s ../../mf/$(outconfbase) svg && \
-		ln -s ../../mf/$(outconfbase) tfm && \
+		ln -s ../../../mf/$(outconfbase) otf && \
+		ln -s ../../../mf/$(outconfbase) svg && \
+		ln -s ../../../mf/$(outconfbase) tfm && \
 		ln -s $(abs-srcdir)/mf && \
 		ln -s $(abs-srcdir)/ps && \
-		ln -s ../../python/$(outconfbase) python && \
+		ln -s ../../../python/$(outconfbase) python && \
 		ln -s $(abs-srcdir)/scm
 	cd $(tree-prefix)/dvips && \
-		ln -s ./../mf/$(outconfbase) mf-out && \
+		ln -s ./../../mf/$(outconfbase) mf-out && \
 		ln -s $(abs-srcdir)/ps
 	cd $(tree-prefix)/tex && \
 		ln -s $(abs-srcdir)/tex source && \
-		ln -s ../../../tex/$(outconfbase) tex-out && \
-		ln -s ../../../mf/$(outconfbase) mf-out
+		ln -s ../../../../tex/$(outconfbase) tex-out && \
+		ln -s ../../../../mf/$(outconfbase) mf-out
 	cd $(tree-prefix)/fonts && \
 		ln -s $(abs-srcdir)/mf source && \
-		ln -s ../../../tex/$(outconfbase) enc && \
-		ln -s ../../../mf/$(outconfbase) map && \
-		ln -s ../../../mf/$(outconfbase) otf && \
-		ln -s ../../../mf/$(outconfbase) tfm && \
-		ln -s ../../../mf/$(outconfbase) svg && \
-		ln -s ../../../mf/$(outconfbase) type1
+		ln -s ../../../../tex/$(outconfbase) enc && \
+		ln -s ../../../../mf/$(outconfbase) map && \
+		ln -s ../../../../mf/$(outconfbase) otf && \
+		ln -s ../../../../mf/$(outconfbase) tfm && \
+		ln -s ../../../../mf/$(outconfbase) svg && \
+		ln -s ../../../../mf/$(outconfbase) type1
 	cd $(tree-prefix)/elisp && \
-		ln -sf ../../../../elisp/$(outconfbase)/lilypond-words.el . && \
+		ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \
 		ln -s $(abs-srcdir)/elisp/*.el .
 	$(foreach i,$(CATALOGS), \
 		mkdir -p $(tree-prefix)/locale/$i/LC_MESSAGES && \
 		cd $(tree-prefix)/locale/$i/LC_MESSAGES && \
-		ln -fs ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
+		ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true
 	touch $@
 
 local-clean: builddir-setup-clean
diff --git a/HACKING b/HACKING
index ec701e8efe..5153ed6a78 100644
--- a/HACKING
+++ b/HACKING
@@ -31,7 +31,13 @@ TEXINPUTS=:
 MFINPUTS=:
 TFMFONTS=:
 
-datadir=$(pwd)/share/lilypond
+. VERSION
+FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+if [ -n "$MY_PATCH_LEVEL" ]; then
+   FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
+fi
+
+datadir=$(pwd)/share/lilypond/$FULL_VERSION
 export TEXMF="{$datadir,"`kpsexpand  \\$TEXMF`"}"
 
 export GS_FONTPATH="$datadir/fonts/type1:/usr/share/texmf/fonts/type1/bluesky/cm:/usr/share/texmf/fonts/type1/public/ec-fonts-mftraced"
-- 
2.39.2