[project @ 2004-09-05 19:12:20 by panne]

* HTML documentation for "foo.xml" goes into directory "foo" again,
  not "foo-html". This is nicer and consistent with the behaviour for
  building the docs from SGML.

* Disabled building PostScript documentation in the spec files for
  now, there are some strange issues with the FO->PS conversion for
  some files which have to be clarified first.

diff --git a/ghc/ghc.spec.in b/ghc/ghc.spec.in
index d2e5b86..61cb9ca 100644 (file)
--- a/ghc/ghc.spec.in
+++ b/ghc/ghc.spec.in
@@ -96,7 +96,7 @@ HTML format. Alternatively, the documentation is available online at
 test -f configure || autoreconf
 ./configure --prefix=%{prefix} --enable-hopengl
 make
-make ps html
+make html
  
 %install
 make prefix=${RPM_BUILD_ROOT}%{prefix} install
@@ -146,16 +146,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files doc
 %defattr(-,root,root)
-%doc docs/building/building-html
-%doc docs/building/building.ps
-%doc docs/docbook-cheat-sheet/docbook-cheat-sheet-html
-%doc docs/docbook-cheat-sheet/docbook-cheat-sheet.ps
+%doc docs/building/building
+%doc docs/docbook-cheat-sheet/docbook-cheat-sheet
 %doc ghc/docs/ext-core/core.ps
 %doc ghc/docs/storage-mgt/ldv.ps
 %doc ghc/docs/storage-mgt/rp.ps
 %doc ghc/docs/storage-mgt/sm.ps
-%doc ghc/docs/users_guide/users_guide-html
-%doc ghc/docs/users_guide/users_guide.ps
-%doc hslibs/doc/hslibs-html
-%doc hslibs/doc/hslibs.ps
+%doc ghc/docs/users_guide/users_guide
+%doc hslibs/doc/hslibs
 %doc html/*

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 7fa1e8a..fa76355 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -250,7 +250,7 @@ endif
                    $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
        cp $(FPTOOLS_CSS_ABS) .
 
-%-html/index.html : %.xml
+%/index.html : %.xml
        $(RM) -rf $(dir $@)
        $(XSLTPROC) --stringparam base.dir $(dir $@) \
                    --stringparam use.id.as.filename 1 \

diff --git a/mk/target.mk b/mk/target.mk
index c824dad..0497cec 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -818,13 +818,13 @@ endif
 # TODO: The following could be an entry for an Obfuscated Makefile Contest...
 ifneq "$(INSTALL_XML_DOC)" ""
 ifneq "$(XMLDocWays)" ""
-install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.htmlhelp,%.chm,$(patsubst %.html,%-html/index.html,.$(i)))))
+install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.htmlhelp,%.chm,$(patsubst %.html,%/index.html,.$(i)))))
        @$(INSTALL_DIR) $(datadir)      
        @for i in $(XMLDocWays); do \
                if [ $$i = "html" ]; then \
                        $(INSTALL_DIR) $(datadir)/html; \
-                       echo "( cd $(INSTALL_XML_DOC)-html && $(CP) * $(datadir)/html )" ; \
-                       ( cd $(INSTALL_XML_DOC)-html && $(CP) * $(datadir)/html ) ; \
+                       echo "( cd $(INSTALL_XML_DOC) && $(CP) * $(datadir)/html )" ; \
+                       ( cd $(INSTALL_XML_DOC) && $(CP) * $(datadir)/html ) ; \
                else \
                        echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.htmlhelp/.chm/ | sed s/\.html-no-chunks/.html/` $(datadir); \
                        $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.htmlhelp/.chm/ | sed s/\.html-no-chunks/.html/` $(datadir); \
@@ -937,7 +937,7 @@ ifeq "$(XML_SRCS)" ""
 XML_SRCS = $(wildcard *.xml)
 endif
 
-XML_HTML           = $(addsuffix -html/index.html,$(basename $(XML_DOC)))
+XML_HTML           = $(addsuffix /index.html,$(basename $(XML_DOC)))
 XML_HTML_NO_CHUNKS = $(addsuffix .html,$(XML_DOC))
 XML_HTMLHELP       = $(addsuffix -htmlhelp/index.html,$(basename $(XML_DOC)))
 XML_FO             = $(addsuffix .fo,$(XML_DOC))
@@ -958,7 +958,7 @@ pdf            :: $(XML_PDF)
 CLEAN_FILES += $(XML_HTML_NO_CHUNKS) $(XML_FO) $(XML_DVI) $(XML_PS) $(XML_PDF)
 
 extraclean ::
-       $(RM) -rf $(XML_DOC).out $(FPTOOLS_CSS) $(basename $(XML_DOC))-html $(basename $(XML_DOC))-htmlhelp
+       $(RM) -rf $(XML_DOC).out $(FPTOOLS_CSS) $(basename $(XML_DOC)) $(basename $(XML_DOC))-htmlhelp
 
 validate ::
        $(XMLLINT) --valid --noout $(XMLLINT_OPTS) $(XML_DOC).xml