From: Andre P. <at...@us...> - 2004-05-14 06:05:23
|
Update of /cvsroot/hoc/hoc/HOC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10883/HOC Modified Files: Makefile.in Log Message: More build system changes ... Build system now actually implements the --with-ghc parameter :) -- define a $GHC variable in config.mk Added --with-ghc-pkg parameter (if you want to e.g. do "--with-ghc-pkg=ghc-pkg-6.2.1") Define $GHC_LIB_PATH in config.mk and use that rather than `ghc --print-libdir` in all the Makefiles Lifted DOT and POD2HTML autoconf substitutions to config.mk, rather than being output directly to docs/Makefile Index: Makefile.in =================================================================== RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.in 12 May 2004 11:11:08 -0000 1.3 +++ Makefile.in 14 May 2004 06:05:13 -0000 1.4 @@ -17,7 +17,7 @@ ghcmake.build-stamp: mkdir -p build/objects mkdir -p build/imports - ghc --make HOC.hs \ + $(GHC) --make HOC.hs \ -odir build/objects -hidir build/imports \ -fglasgow-exts -package-name HOC \ ../HOC_cbits/HOC_cbits.o \ @@ -34,9 +34,9 @@ ghcmake.build-stamp install: all - mkdir -p `ghc --print-libdir`/HOC + mkdir -p $(GHC_LIB_PATH)/HOC cp -R libHOC.a HOC.o build/imports \ - `ghc --print-libdir`/HOC/ - ranlib `ghc --print-libdir`/HOC/libHOC.a - ghc-pkg --update-package \ + $(GHC_LIB_PATH)/HOC/ + ranlib $(GHC_LIB_PATH)/HOC/libHOC.a + $(GHC_PKG) --update-package \ --input-file=HOC-$(PLATFORM).conf |