From: Han-Wen Nienhuys Date: Wed, 4 Dec 2002 23:58:06 +0000 (+0000) Subject: * python/GNUmakefile (INSTALLATION_DIR1): install Python module X-Git-Tag: release/1.7.10~44 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=5076750d784d8fc19a6462915ad76ae155b8ab39 * 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 d6a40d0aea..3f31dfee58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-12-05 Han-Wen Nienhuys + + * 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 * lilypond.words: take \words from Info-index. diff --git a/GNUmakefile.in b/GNUmakefile.in index 242c59b712..1f4944f528 100644 --- 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 e62adcde37..133034bd8c 100644 --- 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 36d6b4939f..01e60397aa 100755 --- 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 f49b025861..33fe5a8ae8 100644 --- 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 4ce88f3013..77b16b94c7 100644 --- 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 fd0a03003d..b1a0d05439 100644 --- 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 80186e69f1..133034bd8c 100644 --- 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 d04b34d12b..44bde97e2f 100644 --- 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)