Fixed the code to actually work.

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

diff --git a/contrib/utils/convertrc/Makefile.in b/contrib/utils/convertrc/Makefile.in
index b256d03e240aafebad260295958a5f9f90b5ea1c..d5efdd43f50c3c66181c941da25cca8534c0f2a5 100644 (file)
--- a/contrib/utils/convertrc/Makefile.in
+++ b/contrib/utils/convertrc/Makefile.in
@@ -37,15 +37,18 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-CONVERTRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-       -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
+       -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \
+       $(CXXFLAGS)
 CONVERTRC_OBJECTS =  \
+       $(__convertrc_os2_lib_res) \
        convertrc_convert.o \
        convertrc_rc2wxr.o \
        convertrc_rc2xml.o \
        convertrc_wxr2xml.o \
        $(__convertrc___win32rc)
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 
 ### Conditionally set variables: ###
@@ -105,6 +108,8 @@ COND_PLATFORM_OS2_1___convertrc___os2_emxbindcmd = $(NM) convertrc$(EXEEXT) | \
        if grep -q pmwin.763 ; then emxbind -ep convertrc$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__convertrc___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___convertrc___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__convertrc___win32rc = convertrc_wxconvert_rc.o
+@COND_PLATFORM_OS2_1@__convertrc_os2_lib_res = \
+@COND_PLATFORM_OS2_1@  $(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -142,11 +147,11 @@ distclean: clean
 install: all install_convertrc
 
 install-strip: install
-       $(STRIP) $(bindir)/convertrc$(EXEEXT)
+       $(STRIP) $(DESTDIR)$(bindir)/convertrc$(EXEEXT)
 
 install_convertrc: 
-       $(INSTALL_DIR) $(bindir)
-       $(INSTALL_PROGRAM) convertrc$(EXEEXT) $(bindir)
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) convertrc$(EXEEXT) $(DESTDIR)$(bindir)
 
 uninstall: