corrected Mac OS X resource file name

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

diff --git a/Makefile.in b/Makefile.in
index 9493303c4b865370f532246b34fc2a67b65e1d0f..5f7899b4b77df27bce3223a85e654172fd995881 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -371,10 +371,10 @@ all: @WX_ALL@
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
 
-./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
        $(DEREZ) $^ $(DEREZFLAGS) > $@
 
-./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
+./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES)
        $(REZ) $(REZFLAGS) $^ -o $@
 
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index d3b1905a347a09cd5f8fed37d262bc137958896a..9e46d880b3b31b5d5745dce49bce485ba8fb3851 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -10,7 +10,7 @@ RES_PROGRAM = $(PROGRAM)_resources.o
 RES_PROGRAM_OPT = @RESPROGRAM@
 
 # To add resources to the Mac OS X applications
-LIBWX_MACRES = $(top_builddir)/lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).r
+LIBWX_MACRES = $(top_builddir)/lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r
 LIBWX_MACRESCOMP = $(RESCOMP) $(RESFLAGS) $(LIBWX_MACRES) -o $(BIN_PROGRAM)
 
 .c.o :