fixing file paths after renaming

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

diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in
index 7247c982435a909af19d5d2a786712d9c8511d91..6361500d70b29aba97c97eb0434bb6a4331ddcbc 100644 (file)
--- a/samples/controls/Makefile.in
+++ b/samples/controls/Makefile.in
@@ -162,7 +162,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
        $(__controls___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
        $(__controls___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 

-@COND_PLATFORM_MACOSX_1@controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@controls.app/Contents/PkgInfo: controls$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns

 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents/Resources
 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p controls.app/Contents/Resources


@@ -171,7 +171,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/controls/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/controls/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \

-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >controls.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >controls.app/Contents/Info.plist

 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >controls.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >controls.app/Contents/PkgInfo


@@ -180,7 +180,7 @@ controls$(EXEEXT): $(CONTROLS_OBJECTS) $(__controls___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       ln -f controls$(EXEEXT) controls.app/Contents/MacOS/controls
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       

-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns controls.app/Contents/Resources/wxmac.icns

 
 @COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP)
 
 
 @COND_PLATFORM_MACOSX_1@controls_bundle: $(____controls_BUNDLE_TGT_REF_DEP)