Typos fixed and further clarification of the Python situation on Panther

[wxWidgets.git] / contrib / utils / wxrc / Makefile.in

diff --git a/contrib/utils/wxrc/Makefile.in b/contrib/utils/wxrc/Makefile.in
index a1ef904965d18c4a22a5ee15e50aec92839e1413..7455957c7b0a41ca46bb81b41074f7cca5b9c621 100644 (file)
--- a/contrib/utils/wxrc/Makefile.in
+++ b/contrib/utils/wxrc/Makefile.in
@@ -16,6 +16,7 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_XML = @EXTRALIBS_XML@
 HOST_SUFFIX = @HOST_SUFFIX@
 INSTALL_DIR = @INSTALL_DIR@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -32,9 +33,10 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
+       $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
 WXRC_OBJECTS =  \
        wxrc_wxrc.o
 
@@ -93,16 +95,16 @@ distclean: clean
 install: all install_wxrc
 
 install-strip: install
-       $(STRIP) $(bindir)/wxrc$(EXEEXT)
+       $(STRIP) $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
 
 install_wxrc: 
-       $(INSTALL_DIR) $(bindir)
-       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(bindir)
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
 
 uninstall: 
 
 wxrc$(EXEEXT): $(WXRC_OBJECTS)
-       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+       $(CXX) -o $@ $(WXRC_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME)   $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
        
        $(__wxrc___mac_setfilecmd)