[Gtk2hs-commit] gtk2hs ChangeLog,1.551,1.552 Makefile.am,1.90,1.91

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Some minor fixes suggested by the debian packaging people. Clean the generated
.hs files for the parse & lexer on make maintainerclean rather than on
distclean. Use nobase_hi_DATA rather than nobase_hi_SCRIPTS so that the .hi
files do not get installed with +x execute permissions. Include gtk2hs.haddock
in the files that get cleaned and make sure all the haddock index files get
cleaned. Install the gtk2hs.haddock file into the same dir as the html docs
rather than the directory below, by default.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- Makefile.am	22 Jun 2005 16:00:18 -0000	1.90
+++ Makefile.am	22 Jun 2005 17:09:05 -0000	1.91
@@ -195,7 +195,7 @@
 tools/c2hs/c/CParser.hs : tools/c2hs/c/CParser.y
 	$(HAPPY) --ghc --array --coerce --strict -o $@ $<
 
-DISTCLEANFILES +=				\
+MAINTAINERCLEANFILES =				\
 	tools/c2hs/c/CParser.hs			\
 	tools/c2hs/c/CLexer.hs
 
@@ -292,7 +292,7 @@
 	$(filter %.hs,$(libHSglib_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSglib_a_SOURCES))
 
-nobase_hi_SCRIPTS = $(libHSglib_a_HSFILES:.hs=.hi)
+nobase_hi_DATA = $(libHSglib_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSglib_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSglib_a_HSFILES:.hs=.hi)
@@ -569,7 +569,7 @@
 	$(filter %.hs,$(libHSgtk_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSgtk_a_ALLSOURCES))
 
-nobase_hi_SCRIPTS += $(libHSgtk_a_HSFILES:.hs=.hi)
+nobase_hi_DATA += $(libHSgtk_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSgtk_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSgtk_a_HSFILES:.hs=.hi)
@@ -624,7 +624,7 @@
 libHSmogul_a_HSFILES = $(libHSmogul_a_SOURCES)
 .PRECIOUS: $(libHSmogul_a_HSFILES:.hs=hi)
 
-nobase_hi_SCRIPTS += $(libHSmogul_a_HSFILES:.hs=.hi)
+nobase_hi_DATA += $(libHSmogul_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSmogul_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSmogul_a_HSFILES:.hs=.hi)
@@ -698,7 +698,7 @@
 	$(filter %.hs,$(libHSglade_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSglade_a_ALLSOURCES))
 
-nobase_hi_SCRIPTS += $(libHSglade_a_HSFILES:.hs=.hi)
+nobase_hi_DATA += $(libHSglade_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSglade_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSglade_a_HSFILES:.hs=.hi)
@@ -799,7 +799,7 @@
 	$(filter %.hs,$(libHSgconf_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSgconf_a_ALLSOURCES))
 
-nobase_hi_SCRIPTS += $(libHSgconf_a_HSFILES:.hs=.hi)
+nobase_hi_DATA += $(libHSgconf_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSgconf_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSgconf_a_HSFILES:.hs=.hi)
@@ -895,7 +895,7 @@
 	$(filter %.hs,$(libHSsourceview_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSsourceview_a_ALLSOURCES))
 
-nobase_hi_SCRIPTS += $(libHSsourceview_a_HSFILES:.hs=.hi)
+nobase_hi_DATA += $(libHSsourceview_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSsourceview_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSsourceview_a_HSFILES:.hs=.hi)
@@ -976,7 +976,7 @@
 	$(filter %.hs,$(libHSmozembed_a_BUILDSOURCES)) \
 	$(filter %.hs,$(libHSmozembed_a_ALLSOURCES))
 
-nobase_hi_SCRIPTS += $(libHSmozembed_a_HSFILES:.hs=.hi)
+nobase_hi_DATA += $(libHSmozembed_a_HSFILES:.hs=.hi)
 
 MOSTLYCLEANFILES += $(am_libHSmozembed_a_OBJECTS)
 MOSTLYCLEANFILES += $(libHSmozembed_a_HSFILES:.hs=.hi)
@@ -1015,19 +1015,17 @@
 
 html_DATA =									\
 	$(foreach HSFILE, $(filter-out $(html_HSFILES_HIDDEN),$(html_HSFILES)),	\
-	    $(patsubst $(firstword $(subst /, ,$(HSFILE))).%.hs, docs/reference/%.html, 	\
+	    $(patsubst $(firstword $(subst /, ,$(HSFILE))).%.hs, docs/reference/%.html,	\
 		$(subst /,.,$(HSFILE:.uncpp=))))				\
 	docs/reference/haddock.css docs/reference/haskell_icon.gif		\
 	docs/reference/index.html docs/reference/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,	\
+	docs/reference/gtk2hs.haddock						\
+	$(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 :,	\
 		docs/reference/doc-index-$(LETTER).html) #missing letters Q and Z
 
-haddockifacedir = $(datadir)/doc/gtk2hs
-haddockiface_DATA = docs/reference/gtk2hs.haddock
-
-# --prologue=doc/prologue.txt
+# --prologue=doc/reference/prologue.txt
 
-$(html_DATA) docs/reference/gtk2hs.haddock : $(html_HSFILES)
+$(html_DATA) : $(html_HSFILES)
 	mkdir -p docs/reference
 	$(strip $(HADDOCK) --html --odir=docs/reference \
 		--title="Gtk2Hs" \

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -d -r1.551 -r1.552
--- ChangeLog	22 Jun 2005 16:00:18 -0000	1.551
+++ ChangeLog	22 Jun 2005 17:09:05 -0000	1.552
@@ -1,3 +1,14 @@
+2005-06-22 Duncan Coutts <du...@co...>
+
+	* Makefile.am: some minor fixes suggested by the debian packaging
+	people. Clean the generated .hs files for the parse & lexer on make
+	maintainerclean rather than on distclean. Use nobase_hi_DATA rather
+	than nobase_hi_SCRIPTS so that the .hi files do not get installed with
+	+x execute permissions. Include gtk2hs.haddock in the files that get
+	cleaned and make sure all the haddock index files get cleaned. Install
+	the gtk2hs.haddock file into the same dir as the html docs rather than
+	the directory below, by default.
+
 2005-06-21 Duncan Coutts <du...@co...>
 
 	* AUTHORS: note that Axel is author and developer and that Duncan is