[wxhaskell-from-cvs @ 2003-08-20 09:57:44 by dleijen]

Renamed WXH library to WXCore

darcs-hash:20030820095746-deb31-cc62939b3ff2bfc3718c5819be02043d2f7ac748.gz

bin/wxhaskell-register

@@ -43,5 +43,5 @@ if test ! -e "${installdir}/wxh.pkg"; then
 fi
 
 # register the packages.
-env installdir=${installdir} ghc-pkg -u -i ${installdir}/wxh.pkg
+env installdir=${installdir} ghc-pkg -u -i ${installdir}/wxcore.pkg
 env installdir=${installdir} ghc-pkg -u -i ${installdir}/wx.pkg

bin/wxhaskell-register.bat

@@ -7,14 +7,14 @@ GOTO installarg
 
 :installarg
 SET installdir=%1
-ghc-pkg -u -i "%1\wxh.pkg"
+ghc-pkg -u -i "%1\wxcore.pkg"
 ghc-pkg -u -i "%1\wx.pkg"
 PAUSE
 GOTO end
 
 :noarg
 SET installdir=%CD%
-ghc-pkg -u -i wxh.pkg
+ghc-pkg -u -i wxcore.pkg
 ghc-pkg -u -i wx.pkg
 PAUSE
 GOTO end

configure

@@ -8,7 +8,7 @@
 #  See license.txt for details.
 #------------------------------------------------------------------------
 
-# $Id: configure,v 1.7 2003/08/14 10:07:37 dleijen Exp $
+# $Id: configure,v 1.8 2003/08/20 09:57:44 dleijen Exp $
 
 #--------------------------------------------------------------------
 # Variables
@@ -96,6 +96,8 @@ if sh ./config.search "$wxconfig"; then
   else if test "$wxtoolkit" = "MAC"; then
     dll=".dylib"
     lib="lib"
+    # use a standard prefix on MacOS X for the installer
+    prefix="/usr/local/wxhaskell"
   fi
   fi
 
@@ -579,13 +581,13 @@ fi
 
 # create packages
 echo "creating package descriptions"
-echo " - config/wxh.pkg"
-cat > config/wxh.pkg << EOF
+echo " - config/wxcore.pkg"
+cat > config/wxcore.pkg << EOF
 Package
-  { name="wxh"
+  { name="wxcore"
   , import_dirs=["\${installdir}/imports"]
   , library_dirs=["\${installdir}"]
-  , hs_libraries=["wxh","wxhcore"]
+  , hs_libraries=["wxcore","wxcore0"]
   , extra_libraries=["$wxclibname"]
   , package_deps = ["base","data"]
   , extra_ld_opts=[$extraldopts]
@@ -599,7 +601,7 @@ Package
   , import_dirs=["\${installdir}/imports"]
   , library_dirs=["\${installdir}"]
   , hs_libraries=["wx"]
-  , package_deps=["wxh"]
+  , package_deps=["wxcore"]
   }
 EOF