+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:
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.
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@
# 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)
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.
(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)
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
])
fi
AC_SUBST(ugh_ugh_autoconf250_builddir)
+
+ # use absolute path.
+ srcdir=$(cd $srcdir; pwd)
+
AC_SUBST(srcdir)
AC_SUBST(stepmake)
AC_SUBST(package)
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])