cvs commit: fptools/ghc/utils/ghc-pkg Main.hs fptools/ghc/compiler/main SysTools.lhs Packages.lhs fptools/libraries/Cabal package.conf.in fptools/libraries/GLUT package.conf.in fptools/libraries/HGL package.conf.in fptools/libraries/HUnit package.conf.in ...

[Simon Marlow]

simonmar    2005/01/20 06:22:33 PST

  Modified files:
    ghc/utils/ghc-pkg    Main.hs 
    ghc/compiler/main    SysTools.lhs Packages.lhs 
    libraries/Cabal      package.conf.in 
    libraries/GLUT       package.conf.in 
    libraries/HGL        package.conf.in 
    libraries/HUnit      package.conf.in 
    libraries/ObjectIO   package.conf.in 
    libraries/OpenAL     package.conf.in 
    libraries/OpenGL     package.conf.in 
    libraries/QuickCheck package.conf.in 
    libraries/Win32      package.conf.in 
    libraries/X11        package.conf.in 
    libraries/base       package.conf.in 
    libraries/fgl        package.conf.in 
    libraries/haskell-src package.conf.in 
    libraries/haskell98  package.conf.in 
    libraries/mtl        package.conf.in 
    libraries/network    package.conf.in 
    libraries/parsec     package.conf.in 
    libraries/readline   package.conf.in 
    libraries/stm        package.conf.in 
    libraries/unix       package.conf.in 
    hslibs/concurrent    package.conf.in 
    hslibs/data          package.conf.in 
    hslibs/hssource      package.conf.in 
    hslibs/lang          package.conf.in 
    hslibs/net           package.conf.in 
    hslibs/object-io     package.conf.in 
    hslibs/posix         package.conf.in 
    hslibs/text          package.conf.in 
    hslibs/util          package.conf.in 
    hslibs/win32         package.conf.in 
    hslibs/xlib          package.conf.in 
    mk                   package.mk 
    ghc/mk               config.mk.in 
    .                    Makefile 
    distrib              Makefile-bin.in 
  Log:
  Fill in the haddock-interfaces and haddock-html fields in the
  package.conf files.
  
  To do this I had to make some changes:
  
    - haddock-interfaces requires the value of $(datadir).  We can't
      just plug this in, because $(datadir) might change at install-time
      (eg. a Windows installer can be placed anywhere, as can a Unix
      binary .tar.gz distribution).  The current trick is for the
      compiler to splice in the value of $libdir in package.conf at
      runtime.  So we could extend this mechanism and tell the compiler
      the value of $datadir via a command-line option, but that seems
      ugly.
  
      On Windows, $datadir==$libdir, so we don't need any changes:
      package.conf still uses $libdir, and a Windows installation is
      independent of its absolute location.  Even 'make install' on
      Windows should have this property.
  
      On Unix:
  	- for 'make install' and in-place execution, we just use
            absolute paths in package.conf
  
  	- for a binary dist, we generate a package.conf that refers
  	  to $libdir and $datadir, and splice in the values at
  	  install-time (distrib/Makefile-bin.in).
  
    - Also, I renamed $libdir to $topdir to more closely reflect its
      actual meaning.  This is somewhat malicious in that it will flush
      out all those clients using $libdir when they really shouldn't
      be :-)
  
  Revision  Changes    Path
  1.59      +3 -3      fptools/ghc/utils/ghc-pkg/Main.hs
  1.124     +2 -2      fptools/ghc/compiler/main/SysTools.lhs
  1.25      +3 -3      fptools/ghc/compiler/main/Packages.lhs
  1.9       +2 -3      fptools/libraries/Cabal/package.conf.in
  1.17      +6 -14     fptools/libraries/GLUT/package.conf.in
  1.14      +2 -2      fptools/libraries/HGL/package.conf.in
  1.5       +2 -2      fptools/libraries/HUnit/package.conf.in
  1.5       +2 -3      fptools/libraries/ObjectIO/package.conf.in
  1.8       +4 -15     fptools/libraries/OpenAL/package.conf.in
  1.13      +6 -13     fptools/libraries/OpenGL/package.conf.in
  1.3       +2 -3      fptools/libraries/QuickCheck/package.conf.in
  1.12      +6 -14     fptools/libraries/Win32/package.conf.in
  1.16      +5 -21     fptools/libraries/X11/package.conf.in
  1.13      +6 -13     fptools/libraries/base/package.conf.in
  1.6       +2 -3      fptools/libraries/fgl/package.conf.in
  1.5       +2 -3      fptools/libraries/haskell-src/package.conf.in
  1.5       +2 -3      fptools/libraries/haskell98/package.conf.in
  1.3       +2 -3      fptools/libraries/mtl/package.conf.in
  1.6       +3 -9      fptools/libraries/network/package.conf.in
  1.3       +2 -3      fptools/libraries/parsec/package.conf.in
  1.4       +3 -9      fptools/libraries/readline/package.conf.in
  1.2       +2 -3      fptools/libraries/stm/package.conf.in
  1.6       +4 -11     fptools/libraries/unix/package.conf.in
  1.5       +4 -4      fptools/hslibs/concurrent/package.conf.in
  1.5       +8 -8      fptools/hslibs/data/package.conf.in
  1.4       +4 -4      fptools/hslibs/hssource/package.conf.in
  1.5       +7 -7      fptools/hslibs/lang/package.conf.in
  1.4       +4 -4      fptools/hslibs/net/package.conf.in
  1.3       +4 -4      fptools/hslibs/object-io/package.conf.in
  1.5       +6 -6      fptools/hslibs/posix/package.conf.in
  1.7       +6 -6      fptools/hslibs/text/package.conf.in
  1.7       +7 -7      fptools/hslibs/util/package.conf.in
  1.5       +4 -4      fptools/hslibs/win32/package.conf.in
  1.3       +6 -6      fptools/hslibs/xlib/package.conf.in
  1.44      +71 -13    fptools/mk/package.mk
  1.4       +1 -0      fptools/ghc/mk/config.mk.in
  1.117     +1 -0      fptools/Makefile
  1.51      +9 -1      fptools/distrib/Makefile-bin.in