X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0fbb3dbf4501b4113f2d5fe775850b7dabc477..c91574928d42adcd48eb30064570f6a57461549f:/samples/image/Makefile.in

diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index c147d6acf8..4447f7eb83 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -96,10 +96,13 @@ COND_PLATFORM_OS2_1___image___os2_emxbindcmd = $(NM) image$(EXEEXT) | if grep -q
 @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
 @COND_PLATFORM_OS2_1@__image_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__image_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@	= image.app/Contents/PkgInfo
 @COND_PLATFORM_MACOSX_1@__image_bundle___depname = image_bundle
 @COND_TOOLKIT_COCOA@____image_BUNDLE_TGT_REF_DEP = \
-@COND_TOOLKIT_COCOA@	image.app/Contents/PkgInfo
-@COND_TOOLKIT_MAC@____image_BUNDLE_TGT_REF_DEP = image.app/Contents/PkgInfo
+@COND_TOOLKIT_COCOA@	$(__image_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_MAC@____image_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	$(__image_app_Contents_PkgInfo___depname)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -159,25 +162,25 @@ image$(EXEEXT): $(IMAGE_OBJECTS) $(__image___win32rc)
 	$(__image___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
-	mkdir -p image.app/Contents
-	mkdir -p image.app/Contents/MacOS
-	mkdir -p image.app/Contents/Resources
-	
-	
-	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-	-e "s/EXECUTABLE/image/" \
-	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/carbon/Info.plist.in >image.app/Contents/Info.plist
-	
-	
-	echo -n "APPL????" >image.app/Contents/PkgInfo
-	
-	
-	ln -f image$(EXEEXT) image.app/Contents/MacOS/image
-	
-	
-	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@image.app/Contents/PkgInfo: image$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents
+@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@	mkdir -p image.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@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/image/" \
+@COND_PLATFORM_MACOSX_1@	-e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@	$(top_srcdir)/src/osx/carbon/Info.plist.in >image.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	echo -n "APPL????" >image.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	ln -f image$(EXEEXT) image.app/Contents/MacOS/image
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	
+@COND_PLATFORM_MACOSX_1@	cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns image.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@image_bundle: $(____image_BUNDLE_TGT_REF_DEP)