aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-08-10 02:45:04 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-08-10 02:45:04 +0000
commitf7b61ab95ce0c8157dc39ee5b0665f4619258e47 (patch)
treea71dd06cb6483849d3f1ee02d1032e800f4752eb
parentcf057940852b80c08275bb28dab9c2f9b01fdc63 (diff)
downloadmandoc-f7b61ab95ce0c8157dc39ee5b0665f4619258e47.tar.gz
mandoc-f7b61ab95ce0c8157dc39ee5b0665f4619258e47.tar.zst
mandoc-f7b61ab95ce0c8157dc39ee5b0665f4619258e47.zip
Clarifications in comments and standard output suggested by
Paul Onyschuk <ptmelville at gmail dot com> (Alpine Linux)
-rw-r--r--Makefile9
-rwxr-xr-xconfigure2
2 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e66c7cac..47f37a7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.434 2014/08/08 23:47:21 schwarze Exp $
+# $Id: Makefile,v 1.435 2014/08/10 02:45:04 schwarze Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -52,9 +52,10 @@ INSTALL_MAN = $(INSTALL_DATA)
# --- user settings related to database support ------------------------
-# If you want to build without database support, for example to avoid
-# the dependency on SQLite3, comment the following line.
-# However, you won't get apropos(1) and makewhatis(8) in that case.
+# Building apropos(1) and makewhatis(8) requires both SQLite3 and fts(3).
+# To avoid those dependencies, comment the following line.
+# Be careful: the fts(3) implementation in glibc is broken on 32bit
+# machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838
#
BUILD_TARGETS += db-build
diff --git a/configure b/configure
index 8a6a74d9..5b987ebe 100755
--- a/configure
+++ b/configure
@@ -14,6 +14,8 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+echo "/* RUNNING ./CONFIGURE - SHOULD BE USED ONLY VIA MAKE, READ INSTALL */"
+
set -e
exec > config.h 2> config.log