+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
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.
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:
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
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)