(tree-lib-prefix-current):

(tree-share-prefix-current): Use version number in tree, add
`current' symlinks.

diff --git a/ChangeLog b/ChangeLog
index 99cd569f5d1e168a01875d5b3c7aec765942976f..3ab0417949e400370f793dee09a7709214bea2cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * make/mutopia-rules.make ($(outdir)/%.png $(outdir)/%.pdf
@@ -14,6 +20,7 @@
 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 13ba6a3dca0086a466f23fb5589ebb12fd34401e..636c66c42ccfae943915a11c15ec0f676c3ab4ec 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -92,8 +92,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:
@@ -118,7 +120,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/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index dc44ed325f8a388f272e0f94b7ae2c996a72dd9a..73f7aa94bedda2ee38cc6fb95caac8d64592d4f9 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -288,7 +288,7 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
     DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
-    DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
+    DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)