From 5885a915fd709d3d1b6559a81145b9fe3aade4d0 Mon Sep 17 00:00:00 2001
From: Robert Spalek <robert@ucw.cz>
Date: Thu, 27 Nov 2008 08:37:06 -0800
Subject: [PATCH] fixing my previous patch according to MJ's comments

---
 build/Makebottom            | 2 +-
 build/Maketop               | 4 ++--
 ucw/perl/UCW/Configure/C.pm | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Makebottom b/build/Makebottom
index 6b9e2e42..35229a6d 100644
--- 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 f82f48c6..6a2103d9 100644
--- 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 b5e8c0c0..9e8da479 100644
--- 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";
 	}
 }
 
-- 
2.39.2