* lily/lexer.ll:

	* lily/include/my-lily-lexer.hh:
	* lily/include/includable-lexer.hh: Add flex kludge.

	* config.hh.in:
	* config.make.in:
	* stepmake/aclocal.m4 (STEPMAKE_DATADIR, STEPMAKE_LIBDIR): Junk
	cruft.

	* stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fix casual cut and paste
	code.

diff --git a/ChangeLog b/ChangeLog
index 908d4106558c1d13a3412f58c965ecec3b4b516c..0837ec9d70d3f91d11cd38a96249ba79126f49a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-02-25  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/lexer.ll: 
+       * lily/include/my-lily-lexer.hh: 
+       * lily/include/includable-lexer.hh: Add flex kludge.
+
+       * config.hh.in: 
+       * config.make.in: 
+       * stepmake/aclocal.m4 (STEPMAKE_DATADIR, STEPMAKE_LIBDIR): Junk
+       cruft.
+       
+       * stepmake/aclocal.m4 (STEPMAKE_LIBDIR): Fix casual cut and paste
+       code.
+
 2003-02-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * ly/spanners-init.ly (cresc, dim): Update to new markup text.

diff --git a/aclocal.m4 b/aclocal.m4
index f198d4c72725000c872df48e78df8445a9add70b..695aeddca5aa393f7692e5ab45ae311e72a1b8e1 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 /home/hanwen/usr/src/lilypond/stepmake/aclocal.m4
-dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
 
@@ -243,51 +240,32 @@ AC_DEFUN(STEPMAKE_DATADIR, [
        presome=${ac_default_prefix}
     fi
     
-    package_datadir=$datadir/$package
-    local_package_datadir=$package_datadir/$FULL_VERSION
     build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package
     
     DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
-    PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"`
-    LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
-    AC_SUBST(package_datadir)
-    AC_SUBST(local_package_datadir)
     AC_SUBST(build_package_datadir)
     AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
-    AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"])
-    AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"])
     AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
 ])
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
+
     if test "$libdir" = "\${exec_prefix}/lib"; then
-           libdir='${exec_prefix}/lib'
+       libdir='${exec_prefix}/lib'
     fi
-    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
+    presome=$exec_prefix
     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!"`
+    LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
+    BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_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}"])
 ])
 
@@ -555,7 +533,12 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(package)
     AC_SUBST(PACKAGE)
     AC_SUBST(PACKAGE_NAME)
-    AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"])
+    # We don't need the upper case variant,
+    # so stick to macros are uppercase convention.
+    # AC_DEFINE_UNQUOTED(package, ["${package}"])
+    # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
+    AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
+    AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
     AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
 
     if test -z "$package_depth"; then

diff --git a/config.hh.in b/config.hh.in
index 5da27000ada59f093a2fb4b021f2555e8b94d35a..5e276610b977510860771d606364dc6ca1f553d4 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -2,15 +2,17 @@
 
 #define PACKAGE "@package@"
 
+#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@"
+
 /* datadir */
 #define DATADIR "@DATADIR@"
 
 /* LilyPond init and input base directory */
-#define PACKAGE_DATADIR "@PACKAGE_DATADIR@"
+#define PACKAGE_DATADIR DATADIR "/" PACKAGE
 #define LILYPOND_DATADIR PACKAGE_DATADIR
 
 /* LilyPond specific init and input directory */
-#define LOCAL_PACKAGE_DATADIR "@LOCAL_PACKAGE_DATADIR@"
+#define LOCAL_PACKAGE_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION
 #define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR
 
 /* default lilypond locale dir */

diff --git a/config.make.in b/config.make.in
index 3e54d8152d880e31962f841131845764e6cb306b..1bfe4ca5d94aa842fb1eba26db42a5e9eeaaa735 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -27,10 +27,6 @@ datadir = @datadir@
 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@
 mandir = @mandir@
 program_prefix = @program_prefix@
@@ -39,6 +35,17 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 stepmake = @stepmake@
 
+# move out of config.make.in?
+package_datadir = $(datadir)/$(package)
+package_libdir = $(libdir)/$(package)
+local_package_datadir = $(lilypond_datadir)/$(TOPLEVEL_VERSION)
+local_package_libdir = $(lilypond_libdir)/$(TOPLEVEL_VERSION)
+
+lilypond_datadir = $(package_datadir)
+lilypond_libdir = $(package_libdir)
+local_lilypond_datadir = $(local_package_datadir)
+local_lilypond_libdir = $(local_package_libdir)
+
 CC = @CC@
 GCC = @GCC@
 CROSS = @cross_compiling@

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index adff5283bdd037814c1ce90854c43e21b234aa01..a05d707b0d41e74b850f7cc8f229032c6102b919 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -10,6 +10,7 @@
 #ifndef INCLUDABLE_LEXER_HH
 #define INCLUDABLE_LEXER_HH
 
+using namespace std;
 #include <FlexLexer.h>
 
 #include "string.hh"

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index fcd89d07eca8bdf3d081026e0c15946123685692..27b98cda648a265a85992386eaf799a7b82468ca 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -9,6 +9,7 @@
 #ifndef LEXER_HH
 #define LEXER_HH
 
+using namespace std;
 #include <FlexLexer.h>
 
 #include "input.hh"

diff --git a/lily/lexer.ll b/lily/lexer.ll
index a0fd1ed4a82e1fa7e9ae11327b2cb22c3ca648ca..31f7820f037d85e899ec89e1e75545db21665a16 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -27,6 +27,7 @@
 #include <errno.h>
 
 #include <iostream>
+using namespace std;
 
 #include "parse-scm.hh"
 #include "lily-guile.hh"

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index fb36d1354dccb92b59516942ed9af4af0f927bf3..695aeddca5aa393f7692e5ab45ae311e72a1b8e1 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -240,51 +240,32 @@ AC_DEFUN(STEPMAKE_DATADIR, [
        presome=${ac_default_prefix}
     fi
     
-    package_datadir=$datadir/$package
-    local_package_datadir=$package_datadir/$FULL_VERSION
     build_package_datadir=$ugh_ugh_autoconf250_builddir/share/$package
     
     DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
-    PACKAGE_DATADIR=`echo ${package_datadir} | sed "s!\\\${prefix}!$presome!"`
-    LOCAL_PACKAGE_DATADIR=`echo ${local_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
-    AC_SUBST(package_datadir)
-    AC_SUBST(local_package_datadir)
     AC_SUBST(build_package_datadir)
     AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
-    AC_DEFINE_UNQUOTED(PACKAGE_DATADIR, ["${PACKAGE_DATADIR}"])
-    AC_DEFINE_UNQUOTED(LOCAL_PACKAGE_DATADIR, ["${LOCAL_PACKAGE_DATADIR}"])
     AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
 ])
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
+
     if test "$libdir" = "\${exec_prefix}/lib"; then
-           libdir='${exec_prefix}/lib'
-    fi
-    presome=${exec_prefix}
-    if test "$exec_prefix" = "NONE"; then
-       presome=${ac_default_prefix}
+       libdir='${exec_prefix}/lib'
     fi
-    
-    package_libdir=$libdir/$package
-    local_package_libdir=$package_libdir/$FULL_VERSION
+    presome=$exec_prefix
     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!"`
+    LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
+    BUILD_PACKAGE_LIBDIR=`echo ${build_package_libdir} | sed "s!\\\${exec_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}"])
 ])
 
@@ -552,7 +533,12 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(package)
     AC_SUBST(PACKAGE)
     AC_SUBST(PACKAGE_NAME)
-    AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE_NAME}"])
+    # We don't need the upper case variant,
+    # so stick to macros are uppercase convention.
+    # AC_DEFINE_UNQUOTED(package, ["${package}"])
+    # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
+    AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
+    AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
     AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
 
     if test -z "$package_depth"; then