[Gtk2hs-commit] gtk2hs/glib glib.cabal.in,1.1.2.1,1.1.2.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/glib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1096/glib

Modified Files:
      Tag: branch-0-9-8
	glib.cabal.in 
Log Message:
Build/install fixes for Windows and OpenBSD:

acinclude.m4: fix file name quoting in the .cabal files so that paths with
	spaces in get read properly.

*/*.cabal.in: put the import-dirs value in "" quotes so that paths with spaces
	in get read properly (fixes installing on Windows with GHC 6.4 and the
	default install location of "C:/Program Files/...").
	Also rename the field extra-ld-opts to ld-options since that is what
	it should actually be called for the new cabal format (fixes linker
	error when building gconf demo on OpenBSD).


Index: glib.cabal.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/glib/glib.cabal.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- glib.cabal.in	9 Jun 2005 16:11:20 -0000	1.1.2.1
+++ glib.cabal.in	18 Jun 2005 04:21:45 -0000	1.1.2.2
@@ -7,11 +7,11 @@
 homepage: http://haskell.org/gtk2hs/
 exposed: True
 exposed-modules: ${modules}
-import-dirs: @hidir@/glib
+import-dirs: "@hidir@/glib"
 library-dirs: @GLIB_LIBDIR_CQ@
 hs-libraries: HSglib
 extra-libraries: @GLIB_LIBS_CQ@
 include-dirs: @GLIB_CFLAGS_CQ@
 includes: glib.h, glib-object.h
 depends: haskell98
-extra-ld-opts: @GLIB_LIBEXTRA_CQ@
+ld-options: @GLIB_LIBEXTRA_CQ@