+2002-12-05 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ * python/GNUmakefile (INSTALLATION_DIR1): install Python module
+ into libdir
+
+ * autogen.sh (srcdir): copy aclocal.m4 if newer.
+
+ * stepmake/aclocal.m4: STEPMAKE_LIBDIR.
+
2002-12-04 Heikki Junes <hjunes@cc.hut.fi>
* lilypond.words: take \words from Info-index.
$(builddir)/share/lilypond-force:
# Preparing LilyPond tree for builddir exec
- cd $(builddir) && rm -rf share
+ cd $(builddir) && rm -rf share lib
mkdir -p $(builddir)/share/lilypond
+ mkdir -p $(builddir)/lib/lilypond
mkdir -p $(builddir)/share/lilypond/fonts
mkdir -p $(builddir)/share/lilypond/tex
+ cd $(builddir)/lib/lilypond && \
+ ln -s ../../python/$(outconfbase) python.
cd $(builddir)/share/lilypond && \
ln -s $(abs-srcdir)/ly ly && \
ln -s ../../mf/$(outconfbase) dvips && \
dnl aclocal.m4 -*-shell-script-*-
-dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /users/hanwen/usr/src/lilypond/stepmake/aclocal.m4
-dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
])
+## ugh: cut & paste programming from datadir.
+AC_DEFUN(STEPMAKE_LIBDIR, [
+ if test "$datadir" = "\${prefix}/lib"; then
+ datadir='${prefix}/lib'
+ fi
+ presome=${prefix}
+ if test "$prefix" = "NONE"; then
+ presome=${ac_default_prefix}
+ fi
+
+ package_libdir=$libdir/$package
+
+ local_package_libdir=$package_libdir/$FULL_VERSION
+ build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package
+
+ DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"`
+ PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"`
+ LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+ BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+
+ AC_SUBST(libdir)
+ AC_SUBST(package_libdir)
+ AC_SUBST(local_package_libdir)
+ AC_SUBST(build_package_libdir)
+ AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
+ AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"])
+ AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"])
+ AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
+])
+
AC_DEFUN(STEPMAKE_END, [
AC_SUBST(OPTIONAL)
AC_SUBST(ROOTSEP)
STEPMAKE_DATADIR
+ STEPMAKE_LIBDIR
])
srcdir=`dirname $0`
+if [ stepmake/aclocal.m4 -nt aclocal.m4 ]; then
+ echo "stepmake/aclocal.m4 is newer. Copying file."
+ cp -f stepmake/aclocal.m4 aclocal.m4
+fi
+
if [ stepmake/autogen.sh -nt autogen.sh ]; then
echo "stepmake/autogen.sh is newer. Copying file."
cp -f stepmake/autogen.sh autogen.sh
builddir = @ugh_ugh_autoconf250_builddir@
build_lilypond_datadir = @build_package_datadir@
+build_lilypond_libdir = @build_package_libdir@
bindir = @bindir@
datadir = @datadir@
includedir = @includedir@
libdir = @libdir@
lilypond_datadir = @package_datadir@
local_lilypond_datadir = @local_package_datadir@
+local_lilypond_libdir = @local_package_libdir@
localedir = @localedir@
mandir = @mandir@
program_prefix = @program_prefix@
./configure --disable-checking --prefix=%{_prefix} --enable-optimising
make MAKE_PFA_FILES=1 all
+make -C mf/ pfa
# make info
make -C Documentation
/sbin/install-info %{_infodir}/lilypond.info.gz %{_infodir}/dir
%endif
-/usr/X11R6/bin/mkfontdir %{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
echo 'Please logout first before using LilyPond.'
fi
%endif
-rm -f %{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/fonts.dir
chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
%files
depth = ..
-STEPMAKE_TEMPLATES=c python-module install po
+STEPMAKE_TEMPLATES=c python-module install-out po
+
include $(depth)/make/stepmake.make
-INSTALLATION_FILES=$(OUT_PY_MODULES) $(OUT_PYC_MODULES) $(OUT_SO_MODULES)
-INSTALLATION_DIR=$(local_lilypond_datadir)/python
+INSTALLATION_OUT_SUFFIXES=1
+
+INSTALLATION_OUT_FILES=$(OUT_SO_MODULES)
+INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
+
+INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
+INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
+
$(outdir)/midi.lo: $(outdir)/config.h
AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
])
+## ugh: cut & paste programming from datadir.
+AC_DEFUN(STEPMAKE_LIBDIR, [
+ if test "$datadir" = "\${prefix}/lib"; then
+ datadir='${prefix}/lib'
+ fi
+ presome=${prefix}
+ if test "$prefix" = "NONE"; then
+ presome=${ac_default_prefix}
+ fi
+
+ package_libdir=$libdir/$package
+
+ local_package_libdir=$package_libdir/$FULL_VERSION
+ build_package_libdir=$ugh_ugh_autoconf250_builddir/lib/$package
+
+ DATADIR=`echo ${libdir} | sed "s!\\\${prefix}!$presome!"`
+ PACKAGE_LIBDIR=`echo ${package_libdir} | sed "s!\\\${prefix}!$presome!"`
+ LOCAL_PACKAGE_LIBDIR=`echo ${local_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+ BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${prefix}!$presome!"`
+
+ AC_SUBST(libdir)
+ AC_SUBST(package_libdir)
+ AC_SUBST(local_package_libdir)
+ AC_SUBST(build_package_libdir)
+ AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
+ AC_DEFINE_UNQUOTED(PACKAGE_LIBDIR, ["${PACKAGE_LIBDIR}"])
+ AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_LIBDIR, ["${LOCAL_PACKAGE_LIBDIR}"])
+ AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
+])
+
AC_DEFUN(STEPMAKE_END, [
AC_SUBST(OPTIONAL)
AC_SUBST(ROOTSEP)
STEPMAKE_DATADIR
+ STEPMAKE_LIBDIR
])
-default: $(OUT_PY_MODULES) $(OUT_PYC_MODULES) $(OUT_SO_MODULES)
\ No newline at end of file
+default: $(OUT_PY_MODULES) $(OUT_PYC_MODULES) $(OUT_SO_MODULES)