corrected Mac OS X resource targets

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

diff --git a/Makefile.in b/Makefile.in
index 4c5ea11ed3ae7975d8dc9b4f7259722793b9e1a8..6408f04a2aa368301b425eeb7ae6f1e321c7bb02 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -371,11 +371,11 @@ all: @WX_ALL@
        @$(INSTALL) -d ./lib
        $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
 
-lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
-       $(DEREZ) $^ $(DEREZFLAGS) > ./lib/$@
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.r: ./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc
+       $(DEREZ) $^ $(DEREZFLAGS) > $@
 
-lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
-       $(REZ) $(REZFLAGS) $^ -o ./lib/$@
+./lib/lib@WX_LIBRARY@-${VER_SUFFIX}.rsrc: $(MACRESOURCES)
+       $(REZ) $(REZFLAGS) $^ -o $@
 
 CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
        @$(RM) ./lib/@WX_LIBRARY_LINK1@

diff --git a/configure b/configure
index 1796c7ec9a51b67c6b0968fccdd6fd5eb92b9d9c..a94313a8cf5a773b505e8a74d19cd1e30ed68b5c 100755 (executable)
--- a/configure
+++ b/configure
@@ -9323,7 +9323,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
             WX_ALL="CREATE_LINKS"
         fi
-               WX_ALL="${WX_ALL} lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
+               WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
                WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
                WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.dylib"

diff --git a/configure.in b/configure.in
index fb4d81a1ef5e7692ec421b3c72f1aa80d2de1753..96a60b2c39f3e50c9cbeb50ca32c8513ac2e3196 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2127,7 +2127,7 @@ if test "$wxUSE_SHARED" = "yes"; then
             WX_ALL="CREATE_LINKS"
         fi
        dnl add the resources target
-       WX_ALL="${WX_ALL} lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
+       WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.r"
        dnl the name of the shared library
        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"
        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.dylib"