* .cvsignore: Remove stepmake (huh!?!), add lib.

* GNUmakefile.in: Add libdir links for builddir runs.

* scripts/midi2ly.py: Add [lilypond_]libdir/python to path,
instead of datadir.

* make/substitute.make (ATVARIABLES): Add lilypond_libdir,
local_lilypond_libdir.

* config.make.in (lilypond_libdir): Add.

* stepmake/stepmake/substitute-rules.make:
* stepmake/stepmake/script-rules.make:
* stepmake/stepmake/python-module-rules.make:
* stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fixes from
lilypond-python-module patch.

diff --git a/.cvsignore b/.cvsignore
index 87d0512e9ae842ae59cfea8267efb2511e6f14da..0aa598fe7cded3cdb3bc9e85616ae4007d3f3334 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -28,12 +28,12 @@ config.make
 config.status
 configure
 fonts
+lib
 log
 ls-R
 ly2dvi.dir
 out
 out-www
 share
-stepmake
 tfm
 tfm.[0-9]

diff --git a/ChangeLog b/ChangeLog
index 09cf84a4e13f33c60c7fdaf2f41bddbfdc6edd1c..6f47262803e68f712808f272506f1e4693e52bf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2002-12-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * .cvsignore: Remove stepmake (huh!?!), add lib.
+
+       * GNUmakefile.in: Add libdir links for builddir runs.
+
+       * scripts/midi2ly.py: Add [lilypond_]libdir/python to path,
+       instead of datadir.
+
+       * make/substitute.make (ATVARIABLES): Add lilypond_libdir,
+       local_lilypond_libdir.
+
+       * config.make.in (lilypond_libdir): Add.
+
+       * stepmake/stepmake/substitute-rules.make: 
+       * stepmake/stepmake/script-rules.make: 
+       * stepmake/stepmake/python-module-rules.make:
+       * stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fixes from
+       lilypond-python-module patch.
+
 2002-12-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * Documentation/user/refman.itely (Graphical interfaces): add note

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1f4944f5287d2de819ba72525404d6184d297dff..5e77962a8567debb84477a6ee1710804bc94b687 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -132,13 +132,13 @@ CATALOGS = $(HELP_CATALOGS:lilypond=)
 
 $(builddir)/share/lilypond-force:
 # Preparing LilyPond tree for builddir exec
-       cd $(builddir) && rm -rf share lib
-       mkdir -p $(builddir)/share/lilypond
+       cd $(builddir) && rm -rf lib share
        mkdir -p $(builddir)/lib/lilypond
+       mkdir -p $(builddir)/share/lilypond
        mkdir -p $(builddir)/share/lilypond/fonts
        mkdir -p $(builddir)/share/lilypond/tex
        cd $(builddir)/lib/lilypond && \
-               ln -s  ../../python/$(outconfbase) python. 
+               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 5dbbe94ae14c88c8036a8dec1399c2a8c10b27a9..eb03abd45bf27d97659ed9209d08cda7263e07c3 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
 dnl aclocal.m4   -*-shell-script-*-
 dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/rz/lilypond/lilypond/stepmake/aclocal.m4
+dnl do not edit! this is aclocal.m4, generated from /home/fred/lily/stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -264,16 +264,15 @@ AC_DEFUN(STEPMAKE_DATADIR, [
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
-    if test "$datadir" = "\${prefix}/lib"; then
-           datadir='${prefix}/lib'
+    if test "$libdir" = "\${exec_prefix}/lib"; then
+           libdir='${exec_prefix}/lib'
     fi
-    presome=${prefix}
-    if test "$prefix" = "NONE"; then
+    presome=${exec_prefix}
+    if test "$exec_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
     

diff --git a/config.make.in b/config.make.in
index 33fe5a8ae8072e73287f2ccacd2598a05f511934..3e54d8152d880e31962f841131845764e6cb306b 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -28,6 +28,7 @@ includedir = @includedir@
 infodir = @infodir@
 libdir = @libdir@
 lilypond_datadir = @package_datadir@
+lilypond_libdir = @package_libdir@
 local_lilypond_datadir = @local_package_datadir@
 local_lilypond_libdir = @local_package_libdir@
 localedir = @localedir@

diff --git a/make/substitute.make b/make/substitute.make
index 9e94bd8d3800006d943948f7276bf290fbd2f90e..3ffbd9bb29ff31bc56d7590e3d8d97377c62662b 100644 (file)
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -12,7 +12,9 @@ ATVARIABLES = \
   date\
   datadir\
   lilypond_datadir\
+  lilypond_libdir\
   local_lilypond_datadir\
+  local_lilypond_libdir\
   localedir\
   PACKAGE\
   package\

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 3b3f00dd9eb7a0ddd886b67acbb3036ef7ca6701..aab73dde087f4f10e50042b0f0b882812876fe08 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -31,17 +31,13 @@ import sys
 ################################################################
 # Users of python modules should include this snippet.
 #
-# If set, LILYPONDPREFIX must take prevalence
-# if datadir is not set, we're doing a build and LILYPONDPREFIX
-datadir = '@local_lilypond_datadir@'
-if not os.path.isdir (datadir):
-       datadir = '@lilypond_datadir@'
-if os.environ.has_key ('LILYPONDPREFIX') :
-       datadir = os.environ['LILYPONDPREFIX']
-       while datadir[-1] == os.sep:
-               datadir= datadir[:-1]
-
-sys.path.insert (0, os.path.join (datadir, 'python'))
+# This soon to be removed for: import lilypond.lilylib as ly
+libdir = '@local_lilypond_libdir@'
+if not os.path.isdir (libdir):
+       libdir = '@lilypond_libdir@'
+sys.path.insert (0, os.path.join (libdir, 'python'))
+
+
 ################################################################
 
 import midi
@@ -450,9 +446,10 @@ class Note:
                elif commas < 0:
                        s = s + "," * -commas
 
-               if and dump_dur (explicit_durations_p \
+               ## FIXME: compile fix --jcn
+               if (dump_dur and explicit_durations_p) \
                   or Duration.compare (self.duration,
-                                       reference_note.duration)):
+                                       reference_note.duration):
                        s = s + self.duration.dump ()
 
                reference_note = self

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 133034bd8c96007ed72e5e33c12fe4b1d94a6f88..afafae37ff3f2ca36baa9e5abfc707be5c4d64b0 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -261,16 +261,15 @@ AC_DEFUN(STEPMAKE_DATADIR, [
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
-    if test "$datadir" = "\${prefix}/lib"; then
-           datadir='${prefix}/lib'
+    if test "$libdir" = "\${exec_prefix}/lib"; then
+           libdir='${exec_prefix}/lib'
     fi
-    presome=${prefix}
-    if test "$prefix" = "NONE"; then
+    presome=${exec_prefix}
+    if test "$exec_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
     

diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make
index d05fa733c238fd29385ce3c7c60f574e7fae88ca..e70f7311bf99e8bab09e40ef233031145ebbb4f4 100644 (file)
--- a/stepmake/stepmake/python-module-rules.make
+++ b/stepmake/stepmake/python-module-rules.make
@@ -5,6 +5,6 @@ $(outdir)/%$(SHARED_MODULE_SUFFIX): $(outdir)/%.lo
 $(outdir)/%.pyc: $(outdir)/%.py
        $(PYTHON) -c 'import py_compile; py_compile.compile ("$<")'
 
-$(outdir)/%.py: %.py
+$(outdir)/%.py: %.py $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@

diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make
index c431f2cd29b14c3d248d7798831e7dbc7db8febb..f15e6831e55ba83049358ae01a2ceadc4af6656f 100644 (file)
--- a/stepmake/stepmake/script-rules.make
+++ b/stepmake/stepmake/script-rules.make
@@ -1,25 +1,25 @@
 
-$(outdir)/%: %.pl
+$(outdir)/%: %.pl $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.bash
+$(outdir)/%: %.bash $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.scm
+$(outdir)/%: %.scm $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.expect
+$(outdir)/%: %.expect $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.sh
+$(outdir)/%: %.sh $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 
-$(outdir)/%: %.py
+$(outdir)/%: %.py $(builddir)/config.make
        cat $< | sed $(sed-atvariables) > $@
        chmod 755 $@
 

diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index fa93fed6f6e8df992712adae79f87d231cfddfa6..45a39890c1868a277454092d49567c2cc381a1cc 100644 (file)
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -1,5 +1,5 @@
 
-$(outdir)/%: %.in
+$(outdir)/%: %.in $(builddir)/config.make
        rm -f $@
        cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@