Various minor bugfixes.

diff --git a/Makefile.am b/Makefile.am
index fcf77c4630baab98afdf13de1277ae98f63fd547..fca756e545df573e23685a0c2ce655fa88121358 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with Automake to generate `Makefile.in'
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.10 1999/07/06 19:18:47 mdw Exp $
+## $Id: Makefile.am,v 1.11 1999/07/06 19:36:05 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -30,6 +30,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.11  1999/07/06 19:36:05  mdw
+## Various minor bugfixes.
+##
 ## Revision 1.10  1999/07/06 19:18:47  mdw
 ## Handle new manual page directory.
 ##
@@ -91,4 +94,9 @@ libmLib_a_SOURCES = \
        lock.c conn.c lbuf.c sel.c selbuf.c tv.c \
        base64.c mdwopt.c str.c testrig.c url.c
 
+# --- Other useful rules ---
+
+install-man:
+       (cd man && make install-man)
+
 ##----- That's all, folks ---------------------------------------------------

diff --git a/man/Makefile.m4 b/man/Makefile.m4
index b8a826bb8c6df1ead42d416946f6d490c99dc747..09d6f7f9b7d7c879ccc31f74843b358f46086dd6 100644 (file)
--- a/man/Makefile.m4
+++ b/man/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.1 1999/07/06 19:14:22 mdw Exp $
+## $Id: Makefile.m4,v 1.2 1999/07/06 19:36:05 mdw Exp $
 ##
 ## Makefile for mLib's manual pages
 ##
@@ -29,11 +29,14 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.2  1999/07/06 19:36:05  mdw
+## Various minor bugfixes.
+##
 ## Revision 1.1  1999/07/06 19:14:22  mdw
 ## Makefile for manual page installation.  Subtle and complicated.
 ##
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign no-installman
 
 dnl --- Read in the various lists of things ---
 
@@ -50,7 +53,7 @@ define(`SRC_LINKS', filenonl(`links', `$(srcdir)/'))
 
 man_MANS = TOPLEVEL LINKS
 
-EXTRA_DIST = $(man_MANS) mksofiles links toplevel
+EXTRA_DIST = Makefile.m4 $(man_MANS) mksofiles links toplevel stamp-so.in
 
 ## --- Various maintenance rules ---
 

diff --git a/setup b/setup
index 453d9a70d04adddf45c754e7fe2421efd9fa225d..38fa3128a02a17c39bfb1d432a6b5df49f21cd99 100755 (executable)
--- a/setup
+++ b/setup
@@ -2,7 +2,7 @@
 
 set -e
 mklinks
-(cd man && ./mksofiles && m4 Makefile.m4 >Makefile.am)
+(cd man && ./mksofiles * && m4 Makefile.m4 >Makefile.am)
 mkaclocal
 automake
 autoconf