* python/GNUmakefile (INSTALLATION_DIR1): install Python module

into libdir

* autogen.sh (srcdir): copy aclocal.m4 if newer.

* stepmake/aclocal.m4: STEPMAKE_LIBDIR.

diff --git a/ChangeLog b/ChangeLog
index d6a40d0aeaf587425e425769a92051ef6d38682b..3f31dfee58c3fdd29c41de366f7fc527c46adbc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 242c59b7123424c992e276d0b498f1c5f43e685e..1f4944f5287d2de819ba72525404d6184d297dff 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -132,10 +132,13 @@ CATALOGS = $(HELP_CATALOGS:lilypond=)
 
 $(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 && \

diff --git a/aclocal.m4 b/aclocal.m4
index e62adcde3725ebbe79f5b1f15a7c3c1c2edc19c8..133034bd8c96007ed72e5e33c12fe4b1d94a6f88 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,4 @@
 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
 
 
@@ -262,6 +259,36 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     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)
@@ -612,6 +639,7 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(ROOTSEP)
   
     STEPMAKE_DATADIR
+    STEPMAKE_LIBDIR
 ])
 
     

diff --git a/autogen.sh b/autogen.sh
index 36d6b4939ff9eb10f10577314e3449466910a05a..01e60397aa003d08a44b2221e5b2a00b95077658 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,11 @@
 
 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

diff --git a/config.make.in b/config.make.in
index f49b02586163f70e915470ed9ed1d80af1f3b391..33fe5a8ae8072e73287f2ccacd2598a05f511934 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -21,6 +21,7 @@ exec_prefix = @exec_prefix@
 
 builddir = @ugh_ugh_autoconf250_builddir@
 build_lilypond_datadir = @build_package_datadir@
+build_lilypond_libdir = @build_package_libdir@
 bindir = @bindir@
 datadir = @datadir@
 includedir = @includedir@
@@ -28,6 +29,7 @@ infodir = @infodir@
 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@

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 4ce88f301337812c058491ae6ceec351d93462a0..77b16b94c765df3c0e8e020d5274faceaedc84d4 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -43,6 +43,7 @@ Documentation and example files of LilyPond. An index is available at
 ./configure --disable-checking --prefix=%{_prefix} --enable-optimising
 
 make MAKE_PFA_FILES=1 all
+make -C mf/ pfa
 
 # make info
 make -C Documentation
@@ -89,7 +90,6 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan
 /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.'
@@ -102,7 +102,6 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-rm -f %{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/fonts.dir
 chkfontpath --remove=%{_datadir}/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 %files

diff --git a/python/GNUmakefile b/python/GNUmakefile
index fd0a03003daf6ebee4ea684f638cfaa8e0264421..b1a0d05439262457baad538f9673a76cd167f878 100644 (file)
--- a/python/GNUmakefile
+++ b/python/GNUmakefile
@@ -1,9 +1,16 @@
 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

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 80186e69f1601592f3c5b0627f9e02bee1084282..133034bd8c96007ed72e5e33c12fe4b1d94a6f88 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -259,6 +259,36 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     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)
@@ -609,6 +639,7 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(ROOTSEP)
   
     STEPMAKE_DATADIR
+    STEPMAKE_LIBDIR
 ])
 
     

diff --git a/stepmake/stepmake/python-module-targets.make b/stepmake/stepmake/python-module-targets.make
index d04b34d12b777965d4fcf417d70981e237ad2c6f..44bde97e2fb7177a499125fed66a8bf299b21f03 100644 (file)
--- a/stepmake/stepmake/python-module-targets.make
+++ b/stepmake/stepmake/python-module-targets.make
@@ -1 +1 @@
-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)