fixed wxINSTALL_PREFIX setting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 8034e7bd77bbe784cfa1f944ece41ff93513f29f..e3089e21b4faa953df76e333affd1931d612ff08 100755 (executable)
--- a/configure
+++ b/configure
@@ -17948,8 +17948,14 @@ EOF
 
 
 
 
 
 

+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix
+fi
+

 cat >> confdefs.h <<EOF
 cat >> confdefs.h <<EOF

-#define wxINSTALL_PREFIX $prefix
+#define wxINSTALL_PREFIX "$wxPREFIX"

 EOF
 
 
 EOF
 
 


@@ -18099,7 +18105,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6

-echo "configure:18103: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18109: checking whether ${MAKE-make} sets \${MAKE}" >&5

 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index ccfc7e049a9843cec902c59ed557bcddf54638e6..550cea8ce172a155291b49b191d5bd214109abf8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4510,7 +4510,13 @@ dnl ---------------------------------------------------------------------------
 dnl define the variable containing the installation prefix (used in dcpsg.cpp)
 dnl ---------------------------------------------------------------------------
 
 dnl define the variable containing the installation prefix (used in dcpsg.cpp)
 dnl ---------------------------------------------------------------------------
 

-AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, $prefix)
+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix
+fi
+
+AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")

 
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above