fixes for wxINSTALL_PREFIX definition

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

diff --git a/configure b/configure
index 15aa3048e070c37cad9477b80dfe627b03d83145..e366a412fd6d8e6872eb8f2dd9920ef50d0a19ce 100755 (executable)
--- a/configure
+++ b/configure
@@ -8266,7 +8266,7 @@ if test "$wxUSE_SHARED" = "yes"; then
       *-pc-os2_emx )
       ;;
       *-*-beos* )
-        SHARED_LD="${CC} -shared -o"
+                        SHARED_LD="${LD} -shared -o"
         PIC_FLAG="-fPIC"
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
@@ -12894,10 +12894,9 @@ if test "$wxUSE_GUI" = "yes"; then
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
                      font forty fractal image minimal richedit wxpoem"
 
-        EXTRADEFS="-DwxINSTALL_PREFIX=\"$prefix\""
+        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
 else
     SAMPLES_SUBDIRS=""
-    EXTRADEFS=
 fi
 
 SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`"
@@ -12959,7 +12958,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 "configure:12963: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:12962: 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

diff --git a/configure.in b/configure.in
index d7d470d68160fa4e2b4b6c497e721a9aee3fb1d6..ca8ee2824dae6125f8e447cd32a33cc65aa64fa4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3124,10 +3124,9 @@ if test "$wxUSE_GUI" = "yes"; then
                      font forty fractal image minimal richedit wxpoem"
 
     dnl this is needed to be able to find AFM files
-    EXTRADEFS="-DwxINSTALL_PREFIX=\"$prefix\""
+    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
 else
     SAMPLES_SUBDIRS=""
-    EXTRADEFS=
 fi
 
 dnl for convenience, sort the samples in alphabetical order

diff --git a/src/make.env.in b/src/make.env.in
index 5e2fc03a9af8f203082fb919933ea1293e5333e4..d5ee1c213ea3967c5e6b679feb007b1910bc059b 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -20,7 +20,7 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS = @EXTRADEFS@
+EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
 
 ########################### VERSION #################################
 
@@ -65,8 +65,8 @@ SHARED_LD   = @SHARED_LD@
 # We *must* include CPPFLAGS in both of these, to make sure that all
 # header files get found.  (KB)
 
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@ $(EXTRADEFS)
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@ $(EXTRADEFS)
+CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@ @CPPFLAGS@
+CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@ @CPPFLAGS@
 PICFLAGS = @PIC_FLAG@
 LDFLAGS = @LDFLAGS@