From 8147ff08f9b71d9f1ca71ca4c7b21e2250d1f18f Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 31 May 2006 10:07:05 +0000
Subject: [PATCH] * config.make.in (datadir): Add datarootdir to silence
 autoconf.

* stepmake/aclocal.m4: Update for autoconf-2.59d.
---
 ChangeLog           |  6 ++++++
 config.make.in      |  4 +---
 lily/relocate.cc    | 17 +++++++----------
 mf/SConscript       | 36 ++++++++++++++++++++++++++++++++----
 stepmake/aclocal.m4 |  2 ++
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88550130b7..f1eae2efef 100644
--- 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 55dfaefda3..4bb0b6f80f 100644
--- 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 8cb2b0861f..d7f7888c4a 100644
--- 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 0bfbe5d5fd..4d3a2744ef 100644
--- 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 5a9e739ad9..93e568bb6c 100644
--- 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}"])
-- 
2.39.2