Make apropos and mandocdb build by default.

diff --git a/Makefile b/Makefile
index 2db51d454fc67201c04267ded16c8f41092c294b..b610cb8e33abd2d6c02e659ab2c33794fcf0d2e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ INSTALL_MAN    = $(INSTALL_DATA)
 # Linux needs -ldb to compile mandocdb.
 #DBLIB          = -ldb
 
-all: mandoc preconv demandoc
+all: mandoc preconv demandoc apropos mandocdb
 
 SRCS            = Makefile \
                   apropos.1 \
@@ -427,7 +427,7 @@ llib-lpreconv.ln: $(PRECONV_LNS)
        $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS)
 
 apropos: $(APROPOS_OBJS) libmandoc.a
-       $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a
+       $(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
 llib-lapropos.ln: $(APROPOS_LNS)
        $(LINT) $(LINTFLAGS) -Capropos $(APROPOS_LNS)

diff --git a/index.sgml b/index.sgml
index af354ce321a1f7401a8adb197e4e319deda0b291..0681c62d466d274b7ad70522867f9cec3f7f3387 100644 (file)
--- a/index.sgml
+++ b/index.sgml
@@ -52,11 +52,12 @@
                        <A NAME="sources">Sources</A>
                </H2>
                <P>
-                       <SPAN CLASS="nm">mdocml</SPAN> is in plain-old ANSI C and should build and run on any modern system.
-                       To build and install into <I>/usr/local/</I>, just run <CODE>make install</CODE>.
-                       Be aware: if you have an existing groff installation, this may overwrite its <B>preconv</B> binary.  
-                       The <A HREF="mandocdb.8.html">mandocdb</A> utility is not yet linked to the build; please <A HREF="#contact">contact
-                       us</A> if you plan to use it.
+                       <SPAN CLASS="nm">mdocml</SPAN> is in plain-old ANSI C and should build and run on any modern system; however, you'll
+                       need <A HREF="http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html">libdb</A> to build <A
+                       HREF="apropos.1.html">apropos</A> and <A HREF="mandocdb.8.html">mandocdb</A> (this is installed by default on BSD UNIX
+                       systems &mdash; see the <I>Makefile</I> if you're running Linux).  To build and install into <I>/usr/local/</I>, just
+                       run <CODE>make install</CODE>.  Be careful: the <B>preconv</B> and <B>apropos</B> binary names are usually taken by
+                       existing utilities.
                </P>
                <H2>
                        <A NAME="binaries">Binaries</A>
@@ -358,7 +359,7 @@
                        <SMALL>
                                Copyright &#169; 2008&#8211;2011 
                                <A CLASS="external" HREF="http://kristaps.bsd.lv">Kristaps Dzonsons</A>, 
-                               $Date: 2011/10/06 23:06:31 $
+                               $Date: 2011/10/06 23:15:56 $
                        </SMALL>
                </P>
        </BODY>