release commit

[lilypond.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index d647407ce409ad0ef5f25070cb579d29b507fc9f..400f64a6bf56f254c776451d98d729c9bbba17b6 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/fred/cvs/savannah/lilypond/stepmake/aclocal.m4
+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
 
@@ -238,24 +238,31 @@ AC_DEFUN(STEPMAKE_CXXTEMPLATE, [
 
 
 AC_DEFUN(STEPMAKE_DATADIR, [
+    if test "$datadir" = "\${prefix}/share"; then
+           datadir='${prefix}/share'
+    fi
     presome=${prefix}
     if test "$prefix" = "NONE"; then
        presome=${ac_default_prefix}
     fi
-    datadir=$(echo ${datadir} | sed "s!\\\${prefix}!$presome!")
     
     package_datadir=$datadir/$package
     local_package_datadir=$package_datadir/$FULL_VERSION
     build_package_datadir=$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}")
+    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}")
 ])
 
 
@@ -337,10 +344,10 @@ AC_DEFUN(STEPMAKE_GETTEXT, [
     if test "$prefix" = "NONE"; then
            presome=${ac_default_prefix}
     fi
-    localedir=$(echo ${localedir} | sed "s!\\\${prefix}!$presome!")
+    LOCALEDIR=$(echo ${localedir} | sed "s!\\\${prefix}!$presome!")
     
     AC_SUBST(localedir)
-    AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}")
+    AC_DEFINE_UNQUOTED(LOCALEDIR, "${LOCALEDIR}")
     AC_CHECK_LIB(intl, gettext)
     AC_CHECK_FUNCS(gettext)
 ])