Re: [Gtk2hs-users] doc-index-X.html

[Marco T. G. e S. <ma...@ri...>]

Good morning.

Em Qui, 2008-07-03 às 12:53 -0400, Peter Gavin escreveu:
> (The fix is to look for 'if WIN32' in Makefile.am that guards the lines 
> adding doc-index-* to htmldoc_DATA.  Change it to 'if !WIN32'.)

Have you tested this fix?  It seems not to be working.  My patch:

<paste>
Index: gtk2hs-0.9.13/Makefile.am
===================================================================
--- gtk2hs-0.9.13.orig/Makefile.am      2008-07-03 18:25:56.000000000
-0300
+++ gtk2hs-0.9.13/Makefile.am   2008-07-03 18:26:12.000000000 -0300
@@ -2217,7 +2217,7 @@
        docs/reference/haddock-util.js
\
        docs/reference/index.html docs/reference/doc-index.html
\
        docs/reference/gtk2hs.haddock
-if WIN32
+if !WIN32
 htmldoc_DATA +=
        $(foreach LETTER, A B C D E F G H I J K L M N O P Q R S T U V W
X Y
                58 , docs/reference/doc-index-$(LETTER).html) #missing Z
< > |, i.e. 60 62 124
</paste>

Which, after autoreconf, generates this diff in Makefile.in:

<paste>
diff -ruN Makefile.in.orig Makefile.in
--- Makefile.in.orig    2008-07-04 11:06:54.000000000 -0300
+++ Makefile.in 2008-07-04 11:07:05.000000000 -0300
@@ -210,7 +210,7 @@
 @ENABLE_GSTREAMER_TRUE@@ENABLE_PROFILING_TRUE@am__append_102 =
$(libHSgstreamer_a_HSFILES:.hs=.p_hi) \
 @ENABLE_GSTREAMER_TRUE@@ENABLE_PROFILING_TRUE@
$(libHSgstreamer_a_HSFILES:.hs=.p_o) \
 @ENABLE_GSTREAMER_TRUE@@ENABLE_PROFILING_TRUE@
$(libHSgstreamer_a_LIBADD:.o=.p_o)
-@BUILDDOCS_TRUE@@WIN32_TRUE@am__append_103 = 
+@BUILDDOCS_TRUE@@WIN32_FALSE@am__append_103 = 
 @HAVE_GTK_VERSION_2_2_TRUE@am__append_104 = demo/fastdraw
 @ENABLE_LIBGLADE_TRUE@am__append_105 = demo/glade demo/calc
demo/noughty
 @ENABLE_LIBGLADE_TRUE@@HAVE_GTK_VERSION_2_4_TRUE@am__append_106 =
demo/filechooser demo/treeList
@@ -753,7 +753,6 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.8 foreign no-dependencies
@@ -3299,8 +3298,8 @@
                | $(GHCPKG) update - --force --package-conf=$@; )
 
 .DELETE_ON_ERROR: package.conf.inplace
-@BUILDDOCS_TRUE@@WIN32_TRUE@   $(foreach LETTER, A B C D E F G H I J K
L M N O P Q R S T U V W X Y
-@BUILDDOCS_TRUE@@WIN32_TRUE@           58 ,
docs/reference/doc-index-$(LETTER).html) #missing Z < > |, i.e. 60 62
124
+@BUILDDOCS_TRUE@@WIN32_FALSE@  $(foreach LETTER, A B C D E F G H I J K
L M N O P Q R S T U V W X Y
+@BUILDDOCS_TRUE@@WIN32_FALSE@          58 ,
docs/reference/doc-index-$(LETTER).html) #missing Z < > |, i.e. 60 62
124
 
 @BUILDDOCS_TRUE@$(htmldoc_DATA) : $(htmldoc_HSFILES)
 @BUILDDOCS_TRUE@       mkdir -p docs/reference
</paste>

A part of this diff is present after running autoreconf without changing
anything in the package:

<paste>
 diff -ruN Makefile.in.orig Makefile.in
--- Makefile.in.orig    2008-07-04 11:08:37.000000000 -0300
+++ Makefile.in 2008-07-04 11:08:48.000000000 -0300
@@ -753,7 +753,6 @@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.8 foreign no-dependencies
</paste>

I've tried to build with this version, and it's not installing the
doc-index files with the documentation.

Greetings.

-- 
Marco Túlio Gontijo e Silva
Página: http://marcotmarcot.googlepages.com/
Blog: http://marcotmarcot.blogspot.com/
Correio: ma...@ri...
XMPP: ma...@ja...
IRC: ma...@ir...
Telefone: 25151920
Celular: 98116720
Endereço:
 Rua Turfa, 639/701
 Prado 30410-370
 Belo Horizonte/MG Brasil