mac paths updated

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

diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index d7b79bdc8eed9c1f293894d3a7fca8aba6134435..bc3b28eb8697d8d28088f320f216d23f2210b592 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -164,7 +164,7 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
        $(__bombs___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p bombs.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p bombs.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p bombs.app/Contents/Resources
@@ -173,7 +173,7 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___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/bombs/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >bombs.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >bombs.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >bombs.app/Contents/PkgInfo
@@ -182,7 +182,7 @@ bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@bombs_bundle: $(____bombs_BUNDLE_TGT_REF_DEP)
 

diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 65afd694122b8fcc86970f90da764baae8a557ef..dac3e230796a3340998aff2ce9356c92b3656d75 100644 (file)
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -182,7 +182,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
        $(__forty___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@forty.app/Contents/PkgInfo: forty$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p forty.app/Contents/Resources
@@ -191,7 +191,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___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/forty/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >forty.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >forty.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >forty.app/Contents/PkgInfo
@@ -200,7 +200,7 @@ forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns forty.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@forty_bundle: $(____forty_BUNDLE_TGT_REF_DEP)
 

diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 94553c1e84f3994eddd35e68faa1be2a4b54cfde..424c2a2bb8a131234f8b2139ad6c91a60037562b 100644 (file)
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -162,7 +162,7 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
        $(__fractal___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@fractal.app/Contents/PkgInfo: fractal$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p fractal.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p fractal.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p fractal.app/Contents/Resources
@@ -171,7 +171,7 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___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/fractal/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >fractal.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >fractal.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >fractal.app/Contents/PkgInfo
@@ -180,7 +180,7 @@ fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@fractal_bundle: $(____fractal_BUNDLE_TGT_REF_DEP)
 

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index c908ddb0b8eec6baa2fc0e41362a219b571b8f61..b000d0af12ff5149febb080172b932b9eec72589 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -165,7 +165,7 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
        $(__life___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p life.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p life.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p life.app/Contents/Resources
@@ -174,7 +174,7 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___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/life/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >life.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >life.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >life.app/Contents/PkgInfo
@@ -183,7 +183,7 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f life$(EXEEXT) life.app/Contents/MacOS/life
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns life.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@life_bundle: $(____life_BUNDLE_TGT_REF_DEP)
 

diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index 77b0003d881a789818ca3a091f3de822b7d38018..f68cf484e5428936f0c14e2bc3449a225b1abbdf 100644 (file)
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -166,7 +166,7 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
        $(__wxpoem___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@wxpoem.app/Contents/PkgInfo: wxpoem$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p wxpoem.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p wxpoem.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p wxpoem.app/Contents/Resources
@@ -175,7 +175,7 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___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/wxpoem/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/mac/carbon/Info.plist.in >wxpoem.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >wxpoem.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >wxpoem.app/Contents/PkgInfo
@@ -184,7 +184,7 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@wxpoem_bundle: $(____wxpoem_BUNDLE_TGT_REF_DEP)