Damn broken pipes.

[wxWidgets.git] / src / make.env.in

diff --git a/src/make.env.in b/src/make.env.in
index a0ee460ddc230345c2f10717cc02d7134045dd35..d48323dce8a71617dd3db1525101a982e8a780f3 100644 (file)
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -11,24 +11,23 @@
 ####################### GENERAL SETTINGS ############################
 
 
-EXTRALIBS = @EXTRA_LIBS@
+EXTRA_LIBS = @EXTRA_LIBS@
 LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
 
 TOOLKIT = @TOOLKIT@
+TOOLKITDIR = @TOOLKIT_DIR@
 
 WXLIB = @WX_LIBRARY_NAME_STATIC@
 WXSHLIB = @WX_LIBRARY_NAME_SHARED@
 
+EXTRADEFS = -D"wxINSTALL_PREFIX=\"@prefix@\""
+
 ########################### VERSION #################################
 
 WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
 WX_MINOR_VERSION_NUMBER = @WX_MINOR_VERSION_NUMBER@
 WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@
 
-########################### Misc #################################
-
-SHELL = @SHELL@
-
 ########################### Programs #################################
 
 # C++ compiler
@@ -59,9 +58,16 @@ SHARED_LD   = @SHARED_LD@
 
 ########################### Flags #################################
 
-CFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CFLAGS@
-CPPFLAGS = @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ @CXXFLAGS@
+#
+# @CPPFLAGS@  (gnu standard) is not C++ flags, but flags for the "cpp"
+# preprocessor. Unfortunately whoever wrote this now uses CPPFLAGS for
+# C++ like CFLAGS for C. :-(
+# 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)
 PICFLAGS = @PIC_FLAG@
-
+LDFLAGS = @LDFLAGS@