moved wxINSTALL_PREFIX from CPPFLAGS to setup.h

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

diff --git a/configure b/configure
index f769b323dcd159bd232a10dbfd92633d64eeb33b..8034e7bd77bbe784cfa1f944ece41ff93513f29f 100755 (executable)
--- a/configure
+++ b/configure
@@ -17948,6 +17948,12 @@ EOF
 
 
 
+cat >> confdefs.h <<EOF
+#define wxINSTALL_PREFIX $prefix
+EOF
+
+
+
 GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
 OPENGL_LIBS="$OPENGL_LINK"
 
@@ -18093,7 +18099,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:18097: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18103: 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 ba45c3913fa82d33226dd261db261fe3ea4e6b1b..ccfc7e049a9843cec902c59ed557bcddf54638e6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4506,6 +4506,12 @@ fi
 
 AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
 
+dnl ---------------------------------------------------------------------------
+dnl define the variable containing the installation prefix (used in dcpsg.cpp)
+dnl ---------------------------------------------------------------------------
+
+AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, $prefix)
+
 dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------

diff --git a/setup.h.in b/setup.h.in
index 12667ee9b398146d4951150db813632313ebad0c..7cc5cb38a91c2f9187535b4f9b6baeaf64935aef 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -21,6 +21,9 @@
 /* fill in with the string wxGetOsDescription() will return */
 #undef WXWIN_OS_DESCRIPTION
 
+/* the installation location prefix from configure */
+#undef wxINSTALL_PREFIX
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 

diff --git a/src/make.env.in b/src/make.env.in
index a8228ea8a4a9cee49b3c32dc94a7300e8d3eefb2..c835ab3fab7fe20871710a69881b8dbef6061697 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -13,7 +13,7 @@
 # see comment near LDFLAGS at the end of file
 EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
 OPENGLLIBS = @OPENGL_LIBS@
-LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
+LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
@@ -21,8 +21,6 @@ TOOLKITDIR = @TOOLKIT_DIR@
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
-EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
-
 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
@@ -67,9 +65,9 @@ DLLTOOL     = @DLLTOOL@
 
 ########################### Flags #################################
 
-CPPFLAGS = $(APPEXTRACPPFLAGS) @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
-CFLAGS = $(APPEXTRACFLAGS) $(CPPFLAGS) @CODE_GEN_FLAGS@ @CFLAGS@
-CXXFLAGS = $(APPEXTRACXXFLAGS) $(CPPFLAGS) \
+CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
+CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
+CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
            @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
 PICFLAGS = @PIC_FLAG@