* config.make.in (datadir): Add datarootdir to silence autoconf.

* stepmake/aclocal.m4: Update for autoconf-2.59d.

diff --git a/ChangeLog b/ChangeLog
index 88550130b7f3a96b7ea9e1567077cba7817d37ce..f1eae2efef41f30011547b7859af5b95b66a9955 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * config.make.in (datadir): Add datarootdir to silence autoconf.
+
+       * stepmake/aclocal.m4: Update for autoconf-2.59d.
+
 2006-05-31  Erlend Aasland  <erlenda@gmail.com>
 
        * dynamic-engraver.cc: fix bug (dynamics collide with accidentals)

diff --git a/config.make.in b/config.make.in
index 55dfaefda36c5d75b8cac538be60cdfb1f6aaedc..4bb0b6f80f5d00ee4fd8caabd3704a80403c83f2 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -50,6 +50,7 @@ configure-srcdir = @srcdir@
 bindir = @bindir@
 build_lilypond_datadir = @build_package_datadir@
 build_lilypond_libdir = @build_package_libdir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 docdir = $(datadir)/doc
 elispdir = $(datadir)/emacs/site-lisp
@@ -144,6 +145,3 @@ TAR = @TAR@
 WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
-
-
-

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 8cb2b0861f25636ad4a01b3d603777e47f892a5a..d7f7888c4a6ecdf7e2d0401b8be4af941caecd26 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -394,14 +394,11 @@ read_relocation_file (string filename)
 void
 read_relocation_dir (string dirname)
 {
-  DIR *dir = opendir  (dirname.c_str ());
-
-  while (struct dirent *ent = readdir (dir))
-    {
-      File_name name (ent->d_name);
-      if (name.ext_ == "reloc")
-       {
-         read_relocation_file (dirname + "/" + name.to_string ());
-       }
-    }
+  if (DIR *dir = opendir (dirname.c_str ()))
+    while (struct dirent *ent = readdir (dir))
+      {
+       File_name name (ent->d_name);
+       if (name.ext_ == "reloc")
+           read_relocation_file (dirname + "/" + name.to_string ());
+      }
 }

diff --git a/mf/SConscript b/mf/SConscript
index 0bfbe5d5fd2ec57c0ad6ebca019691787bc3129b..4d3a2744efb286e36bda4942a99d8eb41d545be4 100644 (file)
--- a/mf/SConscript
+++ b/mf/SConscript
@@ -58,6 +58,34 @@ env.Command ('emmentaler-11.pe',
             '$srcdir/buildscripts/gen-emmentaler-scripts.py',
             '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
 
+env.Command ('emmentaler-13.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
+env.Command ('emmentaler-14.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
+env.Command ('emmentaler-16.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
+env.Command ('emmentaler-18.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
+env.Command ('emmentaler-20.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
+env.Command ('emmentaler-23.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
+env.Command ('emmentaler-26.pe',
+            '$srcdir/buildscripts/gen-emmentaler-scripts.py',
+            '$PYTHON $srcdir/buildscripts/gen-emmentaler-scripts.py --dir=${TARGET.dir}')
+
 map (lambda x: env.Depends (x + '.pfa', x + '.enc'), feta)
 
 
@@ -89,10 +117,10 @@ env.Depends ('aybabtu.otf', 'aybabtu.otf-table')
 env.Depends ('aybabtu.otf', 'aybabtu.otf-gtable')
 
 # Hmm?
-env.Depends ('aybabtu.pfa', 'aybabtu.subfonts')
-env.Depends ('aybabtu.pfa', 'aybabtu.fontname')
-env.Depends ('aybabtu.pfa', 'aybabtu.otf-table')
-env.Depends ('aybabtu.pfa', 'aybabtu.otf-gtable')
+#env.Depends ('aybabtu.pfa', 'aybabtu.subfonts')
+#env.Depends ('aybabtu.pfa', 'aybabtu.fontname')
+#env.Depends ('aybabtu.pfa', 'aybabtu.otf-table')
+#env.Depends ('aybabtu.pfa', 'aybabtu.otf-gtable')
 
 
 ## FIXME

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 5a9e739ad98b0c5c1cae48c71f76f66da272e5d5..93e568bb6cf542030eda86ca41b8e698b5f7179b 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -285,10 +285,12 @@ AC_DEFUN(STEPMAKE_DATADIR, [
     
     build_package_datadir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/share/$package
     
+    DATADIR=`echo ${datadir} | sed "s!\\\${datarootdir}!${prefix}/share!"`
     DATADIR=`echo ${datadir} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
     AC_SUBST(datadir)
+    AC_SUBST(datarootdir)
     AC_SUBST(build_package_datadir)
     AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
     AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])