From f2e629583f8d29395eacb6a43cbe5798dd3616f3 Mon Sep 17 00:00:00 2001
From: Julien Rioux <jrioux@physics.utoronto.ca>
Date: Tue, 12 Mar 2013 10:20:45 -0400
Subject: [PATCH] configure: Fixup default --prefix replacement (issue 3238).

Fixup the default prefix replacement in aclocal.m4 while
handling all possible combinations of --exec-prefix and
--prefix being specified or not.

The following is a diff of the resulting config.status
before/after this patch:

$ diff config.status.backup config.status
806c806
< D["DATADIR"]=" \"NONE/share\""
---
> D["DATADIR"]=" \"/usr/local/share\""
808c808
< D["LIBDIR"]=" \"NONE/lib\""
---
> D["LIBDIR"]=" \"/usr/local/lib\""
---
 aclocal.m4 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index e2888727bd..a9d3a66259 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -304,9 +304,6 @@ AC_DEFUN(STEPMAKE_GXXCODEGENBUG, [
 
 
 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}
@@ -314,7 +311,7 @@ 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!\\\${datarootdir}!${presome}/share!"`
     DATADIR=`echo ${DATADIR} | sed "s!\\\${prefix}!$presome!"`
     BUILD_PACKAGE_DATADIR=`echo ${build_package_datadir} | sed "s!\\\${prefix}!$presome!"`
     
@@ -327,11 +324,14 @@ AC_DEFUN(STEPMAKE_DATADIR, [
 
 ## ugh: cut & paste programming from datadir. 
 AC_DEFUN(STEPMAKE_LIBDIR, [
-
-    if test "$libdir" = "\${exec_prefix}/lib"; then
- 	libdir='${exec_prefix}/lib'
+    presome=${exec_prefix}
+    if test "$presome" = "NONE"; then
+	    presome=${prefix}
     fi
-    presome=$exec_prefix
+    if test "$presome" = "NONE"; then
+	    presome=${ac_default_prefix}
+    fi
+
     build_package_libdir=$ugh_ugh_autoconf250_builddir/out$CONFIGSUFFIX/lib/$package
     
     LIBDIR=`echo ${libdir} | sed "s!\\\${exec_prefix}!$presome!"`
-- 
2.39.2