summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2010-03-31 14:47:07 +0000
committerIan Lynagh <igloo@earth.li>2010-03-31 14:47:07 +0000
commitdb9f94f7c3a82f04ca40b77d0c302ac8e11c7f32 (patch)
tree39a56bb65394b4229a1f8b081a9877fddfcc3e82 /distrib
parent07846c5a4f285839929009a7c74d30c0c44a0c45 (diff)
downloadhaskell-db9f94f7c3a82f04ca40b77d0c302ac8e11c7f32.tar.gz
Pass "-i org.haskell.GHC" to packagemaker when building the OS X installer
This seems to fix this failure: [...] ** BUILD SUCCEEDED ** rm -f -f GHC-system.pmdoc/*-contents.xml /Developer/usr/bin/packagemaker -v --doc GHC-system.pmdoc\ -o /Users/ian/to_release/ghc-6.12.1.20100330/GHC-6.12.1.20100330-i386.pkg 2010-03-31 15:08:15.695 packagemaker[13909:807] Setting to : 0 (null) 2010-03-31 15:08:15.709 packagemaker[13909:807] Setting to : 0 org.haskell.glasgowHaskellCompiler.ghc.pkg 2010-03-31 15:08:15.739 packagemaker[13909:807] relocate: (null) 0 2010-03-31 15:08:15.740 packagemaker[13909:807] *** Terminating app due to uncaught exception 'NSInvalidArgumentException', reason: '*** -[NSXMLDocument initWithXMLString:options:error:]: nil argument' 2010-03-31 15:08:15.741 packagemaker[13909:807] Stack: ( 2511962091, 2447007291, 2511961547, 2511961610, 2432803204, 453371, 447720, 436209, 435510, 9986, 9918 ) make[1]: *** [framework-pkg] Trace/BPT trap make: *** [framework-pkg] Error 2
Diffstat (limited to 'distrib')
-rw-r--r--distrib/MacOS/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile
index 3d7852e7d4..3928d34fa7 100644
--- a/distrib/MacOS/Makefile
+++ b/distrib/MacOS/Makefile
@@ -101,7 +101,7 @@ framework-pkg:
COMMAND_MODE=unix2003
-$(RM) -f GHC-system.pmdoc/*-contents.xml
$(PACKAGEMAKER) -v --doc GHC-system.pmdoc\
- $(PACKAGEMAKER_TARGET) -o $(TOP)/$(PACKAGE_NAME)
+ $(PACKAGEMAKER_TARGET) -o $(TOP)/$(PACKAGE_NAME) -i org.haskell.GHC
# If we don't specify COMMAND_MODE=unix2003 then xcodebuild defaults
# to setting it to legacy, which means that ar builds archives