Use /bin/echo for creation of Mac OS X PkgInfo files.
The built-in of /bin/sh doesn't handle "-n" option that we use (at least not under OS X 10.6), so we were getting "-n APPL????" in the generated files. Fix this by using /bin/echo which does support this option. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -170,7 +170,7 @@ about$(EXEEXT): $(ABOUT_OBJECTS) $(__about___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >about.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >about.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >about.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f about$(EXEEXT) about.app/Contents/MacOS/about
|
||||
|
@@ -170,7 +170,7 @@ htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >htmlhelp.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
|
||||
|
@@ -170,7 +170,7 @@ helpview$(EXEEXT): $(HELPVIEW_OBJECTS) $(__helpview___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >helpview.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >helpview.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >helpview.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f helpview$(EXEEXT) helpview.app/Contents/MacOS/helpview
|
||||
|
@@ -166,7 +166,7 @@ htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlctrl.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htmlctrl.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >htmlctrl.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f htmlctrl$(EXEEXT) htmlctrl.app/Contents/MacOS/htmlctrl
|
||||
|
@@ -175,7 +175,7 @@ htmlprinting$(EXEEXT): $(HTMLPRINTING_OBJECTS) $(__htmlprinting___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >htmlprinting.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >htmlprinting.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >htmlprinting.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f htmlprinting$(EXEEXT) htmlprinting.app/Contents/MacOS/htmlprinting
|
||||
|
@@ -173,7 +173,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >test.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >test.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >test.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f test$(EXEEXT) test.app/Contents/MacOS/test
|
||||
|
@@ -170,7 +170,7 @@ virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >virtual.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >virtual.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >virtual.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
|
||||
|
@@ -170,7 +170,7 @@ widget$(EXEEXT): $(WIDGET_OBJECTS) $(__widget___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >widget.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >widget.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >widget.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f widget$(EXEEXT) widget.app/Contents/MacOS/widget
|
||||
|
@@ -170,7 +170,7 @@ zip$(EXEEXT): $(ZIP_OBJECTS) $(__zip___win32rc)
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >zip.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >zip.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >zip.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f zip$(EXEEXT) zip.app/Contents/MacOS/zip
|
||||
|
Reference in New Issue
Block a user