* stepmake/aclocal.m4 (depth): make sure $srcdir is absolute.

also allow python2.4

* config.make.in (configure-srcdir): remove GXX GCC vars.

* stepmake/aclocal.m4: don't do non-srcdir build with
symlinks. Use inclusion, so the src directory name can be changed.

6 files changed, 47 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d2815cd54..00fceee530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* stepmake/aclocal.m4 (depth): make sure $srcdir is absolute.
+	also allow python2.4
+
+	* config.make.in (configure-srcdir): remove GXX GCC vars.
+
+	* stepmake/aclocal.m4: don't do non-srcdir build with
+	symlinks. Use inclusion, so the src directory name can be changed.
+
 2005-11-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* make/mutopia-vars.make:
@@ -20,6 +30,8 @@
 
 2005-11-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* mf/README: remove xpm / accordion notes.
+
 	* lily/tie-column-format.cc (set_chord_outline): add dots into
 	skyline extents. This fixes tie formatting if the left head has dots.
 
diff --git a/config.make.in b/config.make.in
index cad6dbca5a..cfcd865fa1 100644
--- a/config.make.in
+++ b/config.make.in
@@ -93,13 +93,11 @@ FIND = @FIND@
 FLEX = @FLEX@
 FLEXLEXER_PATH = @FLEXLEXER_PATH@
 FONTFORGE = @FONTFORGE@
-GCC = @GCC@
 GROFF = @GROFF@
 GUILE = @GUILE@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 GUILE_CONFIG = @GUILE_CONFIG@
 GUILE_LDFLAGS = @GUILE_LDFLAGS@
-GXX = @GXX@
 ICFLAGS = @ICFLAGS@
 ILDFLAGS = @ILDFLAGS@
 INIMETAFONT = @INIMETAFONT@
diff --git a/make/toplevel-version.make b/make/toplevel-version.make
index f657bfecee..0dcf5ed9a0 100644
--- a/make/toplevel-version.make
+++ b/make/toplevel-version.make
@@ -1,6 +1,6 @@
 # Toplevel_version.make
 
-include $(depth)/VERSION
+include $(configure-srcdir)/VERSION
 TOPLEVEL_MAJOR_VERSION=$(MAJOR_VERSION)
 TOPLEVEL_MINOR_VERSION=$(MINOR_VERSION)
 TOPLEVEL_PATCH_LEVEL=$(PATCH_LEVEL)
diff --git a/mf/README b/mf/README
index 7dad4c4a22..d416209af2 100644
--- a/mf/README
+++ b/mf/README
@@ -1,18 +1,3 @@
 
 This is a font of music symbols.  All MF sources are original.  Most
-of the doco is in comments in the MF code, and in
-Documentation/tex/fonts.doc
-
-To make xpms of feta20 font:
-
-    make xpms
-
-
-Accordion symbols are broken: comment-out 
-
-    input feta-accordion;
-
-from feta-schrift, and remake mf dir:
-
-    make clean
-    make all xpms
+of the doco is in comments in the MF code.
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f0471cdd85..49baf4aa65 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -33,8 +33,10 @@
     (AccidentalSuggestion
      . (
 	(stencil . ,Accidental_interface::print)
-	(X-offset . ,(ly:make-simple-closure `(,+ ,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent))
-						  ,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+
+			,(ly:make-simple-closure (list Self_alignment_interface::centered_on_x_parent))
+			,(ly:make-simple-closure (list Self_alignment_interface::x_aligned_on_self)))))
 	(self-alignment-X . ,CENTER)
 	(cautionary . #t)
 	(cautionary-style . smaller)
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 8beb120b33..35ead69eac 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -365,14 +365,31 @@ and rerun configure.
 EOF
 	    exit 2
 	fi
-	rm -f GNUmakefile
-	cp $srcdir/GNUmakefile.in GNUmakefile
-	## (cd $srcdir && find . -name GNUmakefile -o -name '*.make' | grep -v config.make | xargs tar -cf-) | tar -xf-
-	for i in $(cd $srcdir && find . -name GNUmakefile -o -name '*.make' | grep -v config.make); do
-	    mkdir -p $(dirname $i)
-	    ln -sf $srcdir/$i $i
+
+	for d in 2 3 4 ; do
+	    for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name GNUmakefile`; do
+		mkdir -p $(dirname $mf)
+	        cat <<EOF | $PYTHON -  > $mf
+print 'depth=' + ('../' * ( $d-1 ) )
+print 'include \$(depth)/config.make'
+print 'include \$(configure-srcdir)/$mf'
+EOF
+	    done
+	    for mf in `cd $srcdir ; find -maxdepth $d -mindepth $d -name '*.make' | grep -v config.make `; do
+		mkdir -p $(dirname $mf)
+	        cat <<EOF | $PYTHON -  > $mf
+print 'include \$(depth)/config.make'
+print 'include \$(configure-srcdir)/$mf'
+EOF
+	    done
 	done
-	ln -sf $srcdir/VERSION .
+
+	
+	cat <<EOF > GNUmakefile
+depth = ./
+include config.make
+include \$(configure-srcdir)/GNUmakefile.in
+EOF
 	AC_SUBST(VPATH)
     fi
 ])
@@ -673,6 +690,10 @@ AC_DEFUN(STEPMAKE_INIT, [
     fi
 
     AC_SUBST(ugh_ugh_autoconf250_builddir)
+
+    # use absolute path.
+    srcdir=$(cd $srcdir;  pwd)
+    
     AC_SUBST(srcdir)
     AC_SUBST(stepmake)
     AC_SUBST(package)
@@ -967,7 +988,7 @@ AC_DEFUN(STEPMAKE_PERL, [
 AC_DEFUN(STEPMAKE_PYTHON, [
     unset pv
     AC_MSG_CHECKING([for python])
-    for python in $PYTHON python python2 python2.3 python2.2 python2.1 python2.0; do
+    for python in $PYTHON python python2 python2.4 python2.3 python2.2 python2.1 python2.0; do
 	AC_MSG_RESULT([$python])
 	if ! $python -V > /dev/null 2>&1 ; then
 	    #AC_MSG_WARN([cannot execute $python])