fixing my previous patch according to MJ's comments

diff --git a/build/Makebottom b/build/Makebottom
index 6b9e2e42104282034526dad4a2912367f347252a..35229a6d31be75c178e54a2933b4eea629f101cb 100644 (file)
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -198,7 +198,7 @@ $(DATAFILES): $(o)/%: $(s)/%
 
 $(o)/%.html: $(o)/%.txt $(BUILDSYS)/asciidoc.conf $(BUILDSYS)/asciidoc-xhtml.conf run/$(DOCDIR)/$(DOC_MODULE)/.dir-stamp
        $(M)"DOC-HTML $<"
-       $(Q)asciidoc -e -f $(BUILDSYS)/asciidoc.conf -f $(BUILDSYS)/asciidoc-xhtml.conf -f $(PREFIX)/etc/asciidoc/asciidoc.conf -f $(PREFIX)/etc/asciidoc/xhtml11.conf $<
+       $(Q)asciidoc -e -f $(BUILDSYS)/asciidoc.conf -f $(BUILDSYS)/asciidoc-xhtml.conf -f $(HOST_PREFIX)/etc/asciidoc/asciidoc.conf -f $(HOST_PREFIX)/etc/asciidoc/xhtml11.conf $<
        $(Q)$(call symlink,$@,run/$(DOCDIR)/$(DOC_MODULE))
 
 # In reality, we do not depend on the .txt files, but on the corresponding .deflist's.

diff --git a/build/Maketop b/build/Maketop
index f82f48c647cc37c12fde2ec09c3a73a177354983..6a2103d99b6fab16aa2272ae61a3508e79d943b0 100644 (file)
--- a/build/Maketop
+++ b/build/Maketop
@@ -36,10 +36,10 @@ endif
 
 ifdef CONFIG_DARWIN
 SOEXT=bundle
-PREFIX=/sw
+HOST_PREFIX=/sw
 else
 SOEXT=so
-PREFIX=
+HOST_PREFIX=
 endif
 SO_RUNDIR=lib
 

diff --git a/ucw/perl/UCW/Configure/C.pm b/ucw/perl/UCW/Configure/C.pm
index b5e8c0c0d2ff66cbe10df6a4a91c51f1824eb76f..9e8da479c70b6ab53093d7d9082327bea54231e8 100644 (file)
--- a/ucw/perl/UCW/Configure/C.pm
+++ b/ucw/perl/UCW/Configure/C.pm
@@ -259,7 +259,7 @@ if (IsSet("CONFIG_DARWIN")) {
        Set("O_DIRECT" => 0);           # Darwin doesn't support direct IO, so make Sherlock at least compilable
        if (!IsSet("CONFIG_POSIX_REGEX") && !IsSet("CONFIG_PCRE")) {
                Set("CONFIG_POSIX_REGEX" => 1);
-               Warn "BSD regexp library on Darwin isn't compatible, using POSIX regexp.\n";
+               Warn "BSD regex library on Darwin isn't compatible, using POSIX regex.\n";
        }
 }