From c1fe0128fc3f7f3179233a90eafdca01753be39c Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 1 Jun 2006 00:46:11 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog           | 7 +++++++
 GNUmakefile.in      | 8 ++++++--
 config.make.in      | 4 +---
 stepmake/aclocal.m4 | 3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dca45c834e..ee9b4b6c0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,16 @@
 
 	* stepmake/aclocal.m4: robuster version detection.
 
+2006-06-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* GNUmakefile.in (tree-lib-prefix-current):
+	(tree-share-prefix-current): Use version number in tree, add
+	`current' symlinks.
+
 2006-06-01  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* stepmake/aclocal.m4: Robustification for (gcc) version detection.
+	Another datarootdir reto.
 
 	* cygwin/postinstall-lilypond.sh: Do not fail if info docs aren't
 	available.  This should be moved to postinstall-lilypond-doc.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 9e68971f0d..f09cf2308e 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -96,8 +96,10 @@ tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/current
-tree-lib-prefix = $(tree-lib)/lilypond/current
+tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
+tree-share-prefix-current = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
+tree-lib-prefix-current = $(tree-lib)/lilypond/current
 
 C_DIRS = flower lily
 c-clean:
@@ -122,7 +124,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 	cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
 	mkdir -p $(tree-bin)
 	mkdir -p $(tree-share-prefix)
+	ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
 	mkdir -p $(tree-lib-prefix)
+	ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
 	mkdir -p $(tree-share-prefix)/dvips
 	mkdir -p $(tree-share-prefix)/elisp
 	mkdir -p $(tree-share-prefix)/fonts
diff --git a/config.make.in b/config.make.in
index 55dfaefda3..7179af1f7d 100644
--- a/config.make.in
+++ b/config.make.in
@@ -51,6 +51,7 @@ bindir = @bindir@
 build_lilypond_datadir = @build_package_datadir@
 build_lilypond_libdir = @build_package_libdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = $(datadir)/doc
 elispdir = $(datadir)/emacs/site-lisp
 includedir = @includedir@
@@ -144,6 +145,3 @@ TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
-
-
-
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index e352d40bf8..4ceb4d339c 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -286,7 +286,8 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
-    DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
+    DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
+    DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
-- 
2.39.5