~ chicken-core (chicken-5) c4b71df8f76d58360cc781cf4dca6a17b0f1ddb1
commit c4b71df8f76d58360cc781cf4dca6a17b0f1ddb1
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Dec 2 08:44:14 2010 -0500
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Thu Dec 2 08:44:14 2010 -0500
use manual-labor in makefiles for generating html to be distributed
diff --git a/rules.make b/rules.make
index e9af6fa1..4347644c 100644
--- a/rules.make
+++ b/rules.make
@@ -416,7 +416,7 @@ install-other-files:
$(SRCDIR)$(obj) "$(DESTDIR)$(IMANDIR)" $(NL))
$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) "$(DESTDIR)$(IDOCDIR)$(SEP)manual"
- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)manual$(SEP)* "$(DESTDIR)$(IDOCDIR)$(SEP)manual"
+ -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)manual-html$(SEP)* "$(DESTDIR)$(IDOCDIR)$(SEP)manual"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)README "$(DESTDIR)$(IDOCDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)LICENSE "$(DESTDIR)$(IDOCDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)setup.defaults "$(DESTDIR)$(IDATADIR)"
@@ -565,13 +565,13 @@ setup-download.c: $(SRCDIR)setup-download.scm setup-api.c
distfiles: $(DISTFILES)
-dist: distfiles
+dist: distfiles html
CSI=$(CSI) $(CSI) -s $(SRCDIR)scripts$(SEP)makedist.scm --platform=$(PLATFORM) CHICKEN=$(CHICKEN)
+# Jim's `manual-labor' must be installed (just run "chicken-install manual-labor")
html:
- $(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(SRCDIR)html
- $(COPY_COMMAND) $(SRCDIR)misc$(SEP)manual.css $(SRCDIR)html
- $(CSI) -s $(SRCDIR)scripts$(SEP)wiki2html.scm --outdir=html manual$(SEP)*
+ $(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(SRCDIR)manual-html
+ manual-labor $(SRCDIR)manual $(SRCDIR)manual-html
# cleaning up
diff --git a/scripts/makedist.scm b/scripts/makedist.scm
index a9ca70d7..75fe2726 100644
--- a/scripts/makedist.scm
+++ b/scripts/makedist.scm
@@ -25,7 +25,10 @@
((msvc) "msvc")
(else sv))))))
-(define *make* "make")
+(define *make*
+ (cond ((string=? "bsd" *platform*) "gmake")
+ ((string=? "mingw32" *platform*) "mingw32-make")
+ (else "make")))
(define (release full?)
(let* ((files (read-lines "distribution/manifest"))
Trap