Hi,
Apparently I don't know much about makefiles and the last patch I sent
makes only chm files and not html files ever.
So here is another patch that fixes that.
Also I've decided that I don't like makefiles. :)
I can't believe how long it took for me to find a solution to the problem :(
Regards,
Andrew
Index: Makefile.fpc
===================================================================
--- Makefile.fpc (revision 344)
+++ Makefile.fpc (working copy)
@@ -82,7 +82,30 @@
ASCIIMODE=NO
endif
+ifndef HTMLFMT
+ HTMLFMT=html
+endif
+ifndef RTLLINKPREFIX
+ ifeq (chm, $(HTMLFMT))
+ RTLLINKPREFIX:=ms-its:rtl.chm::/
+ else
+ RTLLINKPREFIX:=../rtl/
+ endif
+endif
+
+FCLOPTS=$(FPDOCOPTS) --package=fcl --hide-protected --warn-no-node --descr=fcl.xml --content=fcl.xct --import=rtl.xct,$(RTLLINKPREFIX) $(FCLUNITOPTS)
+
+ifeq (chm,$(HTMLFMT))
+ HTMLSUFFIX:=.chm
+ FPDOCHTMLOPTS=--auto-toc --auto-index
+ ifdef CSSFILE
+ FPDOCHTMLOPTS+=--css-file=$(CSSFILE)
+ endif
+endif
+
+
+
#######################################################################
# LaTeX Program definitions
#######################################################################
@@ -595,21 +618,6 @@
endif # USEL2H
endif # USEHEVEA
-ifndef HTMLFMT
- HTMLFMT=html
-endif
-
-ifndef RTLLINKPREFIX
- ifeq (HTMLFMT,html)
- RTLLINKPREFIX=../rtl/
- else
- RTLLINKPREFIX=ms-its:rtl.chm::/
- endif
-endif
-
-FCLOPTS=$(FPDOCOPTS) --package=fcl --hide-protected --warn-no-node --descr=fcl.xml --content=fcl.xct --import=rtl.xct,$(RTLLINKPREFIX) $(FCLUNITOPTS)
-
-
fcl.chk: $(FCLXML)
$(FPDOC) $(FCLOPTS) --format=$(HTMLFMT) --output=fcl$(HTMLSUFFIX) $(FPDOCHTMLOPTS)
touch fcl.chk
@@ -627,15 +635,9 @@
html: $(INCLUDES) $(CHK)
-chm: html
-HTMLFMT=chm
-HTMLSUFFIX=.chm
-FPDOCHTMLOPTS=--auto-toc --auto-index
-ifdef CSSFILE
- FPDOCHTMLOPTS+=--css-file=$(CSSFILE)
-endif
+chm:
+ $(MAKE) html HTMLFMT=chm
-
endif # INSTALLDEBUG
#######################################################################
# Targets to force using a specific tool.
_______________________________________________
fpc-devel maillist - [email protected]
http://lists.freepascal.org/mailman/listinfo/fpc-devel
