* config.make.in (prefix): Prepend $(DESTDIR) to allow install

without overriding prefix.

* aclocal.m4: Regenerate.

* stepmake/aclocal.m4: Don't expand $prefix: fixes install with
other $prefix.

diff --git a/ChangeLog b/ChangeLog
index 615345923c09cf2b6f0cc37bf877c60d1055d832..852879460e31b952602da2ccd033e2c63d4fc5cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * config.make.in (prefix): Prepend $(DESTDIR) to allow install
+       without overriding prefix.
+
+       * aclocal.m4: Regenerate.
+       
+       * stepmake/aclocal.m4: Don't expand $prefix: fixes install with
+       other $prefix.
+
        * cygwin/GNUmakefile: 
        * ly/GNUmakefile: 
        * python/GNUmakefile: 

diff --git a/aclocal.m4 b/aclocal.m4
index d647407ce409ad0ef5f25070cb579d29b507fc9f..8d3752a742c58399659832a843e87aafbcdf77c2 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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)
 ])

diff --git a/config.hh.in b/config.hh.in
index d1eea7facd1eee3cbcae1940556392c4861bd27a..5da27000ada59f093a2fb4b021f2555e8b94d35a 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -10,7 +10,7 @@
 #define LILYPOND_DATADIR PACKAGE_DATADIR
 
 /* LilyPond specific init and input directory */
-#define LOCAL_PACKAGE_DATADIR "@local_package_datadir@"
+#define LOCAL_PACKAGE_DATADIR "@LOCAL_PACKAGE_DATADIR@"
 #define LOCAL_LILYPOND_DATADIR LOCAL_PACKAGE_DATADIR
 
 /* default lilypond locale dir */

diff --git a/config.make.in b/config.make.in
index d49a208e07a31acfc2898184863142f90d332de5..e67c074f3b997625773b2eb70bdc87ad62cf90e6 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -16,7 +16,7 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
 exec_prefix = @exec_prefix@
 
 builddir = @builddir@

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index dc1a5adf022556c9193396c0e71b770abe8adfde..be1dcab893229788c9fa9800de7962847d955787 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -235,24 +235,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}")
 ])
 
 
@@ -334,10 +341,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)
 ])