Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9560
Modified Files:
ChangeLog configure.ac Makefile.am
Log Message:
Get everything to be installed under $pkglibdir rather than $libdir (ie
$prefix/gtk2hs/*).
Fix building of .hs.uncpp files needed for haddock (add to SUFFIXs).
Get all doc files to be installed. I'm not sure where the html docs should be
installed however, it's $(datadir)/doc/gtk2hs/html for now.
Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.ac 13 Jan 2005 23:01:16 -0000 1.16
+++ configure.ac 14 Jan 2005 00:12:24 -0000 1.17
@@ -395,7 +395,7 @@
AC_ARG_WITH(hidir,
[ --with-hidir=DIR specify install dir for .hi files],
[hidir=$withval],
- [hidir=$libdir/hi])
+ [hidir='$(pkglibdir)/imports'])
AC_SUBST(hidir)
dnl Check if user wants bindings for deprecated APIs. Defaults to yes.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am 13 Jan 2005 23:01:16 -0000 1.33
+++ Makefile.am 14 Jan 2005 00:12:24 -0000 1.34
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign subdir-objects
-SUFFIXES = .chs.pp .chs .hsc .deps .dep
+SUFFIXES = .hs.uncpp .chs.pp .chs .hsc .deps .dep
MOSTLYCLEANFILES = *.deps.bak
CLEANFILES =
DISTCLEANFILES = */*.precomp
@@ -22,20 +22,20 @@
CHSDEPEND = $(srcdir)/mk/chsDepend
# all packages and applications
-lib_LIBRARIES = \
+pkglib_LIBRARIES = \
libHSglib.a \
libHSgtk.a \
libHSmogul.a
if ENABLE_LIBGLADE
-lib_LIBRARIES += libHSglade.a
+pkglib_LIBRARIES += libHSglade.a
endif
if ENABLE_GNOME
-lib_LIBRARIES += \
+pkglib_LIBRARIES += \
libHSgconf.a \
libHSsourceview.a
endif
if ENABLE_MOZEMBED
-lib_LIBRARIES += libHSmozembed.a
+pkglib_LIBRARIES += libHSmozembed.a
endif
noinst_PROGRAMS = \
@@ -474,9 +474,13 @@
nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi)
if BUILDDOCS
-htmldir = $(prefix)/html
-html_DATA = $(foreach HSFILE, $(libHSgtk_a_HSFILES), \
- $(patsubst gtk.%.hs, doc/%.html, $(subst /,.,$(HSFILE))))
+htmldir = $(datadir)/doc/gtk2hs/html
+html_DATA = \
+ $(foreach HSFILE, $(libHSgtk_a_HSFILES), \
+ $(patsubst gtk.%.hs, doc/%.html, $(subst /,.,$(HSFILE)))) \
+ doc/index.html doc/haddock.css doc/haskell_icon.gif doc/doc-index.html \
+ $(foreach LETTER, A B C D E F G H I J K L M N O P R S T U V W X Y, \
+ doc/doc-index-$(LETTER).html) #missing letters Q and Z
EXCLUDE_DOCS =
PREPROC_DOCS = gtk/Graphics/UI/Gtk.hs
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- ChangeLog 13 Jan 2005 23:09:20 -0000 1.289
+++ ChangeLog 14 Jan 2005 00:12:24 -0000 1.290
@@ -13,6 +13,12 @@
issues with the NAME make var being set incorrectly. I have a plan to
replace the cunning NAME hack with a different hack.
+ * configure.ac, Makefile.am: get everything to be installed under
+ $pkglibdir rather than $libdir (ie $prefix/gtk2hs/*).
+ Fix building of .hs.uncpp files needed for haddock (add to SUFFIXs).
+ Get all doc files to be installed. I'm not sure where the html docs
+ should be installed however, it's $(datadir)/doc/gtk2hs/html for now.
+
2005-01-12 Axel Simon <A....@ke...>
* Makefile.am, gtk/Graphics/UI/Gtk/Pango/Rendering.chs.pp,
|
