Use size_t in manpath instead of int.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 589333e1cfb2795debbf6d8391578d3ba0bb068d..304237b47827c3e55f3a6af9c4f06defff8341ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@
 #
 # CFLAGS       += -DOSNAME="\"OpenBSD 4.5\""
 
-VERSION                 = 1.12.0
-VDATE           = 8 October 2011
+VERSION                 = 1.12.1
+VDATE           = 23 March 2012
 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
@@ -29,7 +29,9 @@ CFLAGS                += -DUSE_WCHAR
 # variable.
 #CFLAGS                += -DUSE_MANPATH
 
-# If your system supports static binaries only, uncomment this.
+# If your system supports static binaries only, uncomment this.  This
+# appears only to be BSD UNIX systems (Mac OS X has no support and Linux
+# requires -pthreads for static libdb).
 STATIC          = -static
 
 CFLAGS         += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
@@ -76,6 +78,7 @@ SRCS           = Makefile \
                   cgi.c \
                   chars.c \
                   chars.in \
+                  compat_fgetln.c \
                   compat_getsubopt.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
@@ -104,7 +107,7 @@ SRCS                 = Makefile \
                   man.7 \
                   man.c \
                   man.cgi.7 \
-                  man.cgi.css \
+                  man-cgi.css \
                   man.h \
                   man_hash.c \
                   man_html.c \
@@ -139,7 +142,6 @@ SRCS                 = Makefile \
                   preconv.c \
                   predefs.in \
                   read.c \
-                  regress \
                   roff.7 \
                   roff.c \
                   st.c \
@@ -156,6 +158,7 @@ SRCS                 = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
+                  test-fgetln.c \
                   test-getsubopt.c \
                   test-mmap.c \
                   test-strlcat.c \
@@ -224,10 +227,12 @@ LIBMANDOC_LNS      = $(LIBMAN_LNS) \
                   msec.ln \
                   read.ln
 
-COMPAT_OBJS     = compat_getsubopt.o \
+COMPAT_OBJS     = compat_fgetln.o \
+                  compat_getsubopt.o \
                   compat_strlcat.o \
                   compat_strlcpy.o
-COMPAT_LNS      = compat_getsubopt.ln \
+COMPAT_LNS      = compat_fgetln.ln \
+                  compat_getsubopt.ln \
                   compat_strlcat.ln \
                   compat_strlcpy.ln
 
@@ -331,7 +336,7 @@ $(CGI_OBJS) $(CGI_LNS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h
 CATMAN_OBJS     = catman.o manpath.o
 CATMAN_LNS      = catman.ln manpath.ln
 
-$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h 
+$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h mandocdb.h
 
 DEMANDOC_OBJS   = demandoc.o
 DEMANDOC_LNS    = demandoc.ln
@@ -343,6 +348,11 @@ INDEX_MANS  = apropos.1.html \
                   apropos.1.ps \
                   apropos.1.pdf \
                   apropos.1.txt \
+                  catman.8.html \
+                  catman.8.xhtml \
+                  catman.8.ps \
+                  catman.8.pdf \
+                  catman.8.txt \
                   demandoc.1.html \
                   demandoc.1.xhtml \
                   demandoc.1.ps \
@@ -373,6 +383,11 @@ INDEX_MANS  = apropos.1.html \
                   man.7.ps \
                   man.7.pdf \
                   man.7.txt \
+                  man.cgi.7.html \
+                  man.cgi.7.xhtml \
+                  man.cgi.7.ps \
+                  man.cgi.7.pdf \
+                  man.cgi.7.txt \
                   mandoc_char.7.html \
                   mandoc_char.7.xhtml \
                   mandoc_char.7.ps \
@@ -437,11 +452,16 @@ clean:
        rm -f config.h config.log $(COMPAT_OBJS) $(COMPAT_LNS)
        rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip mdocml-macosx.zip
        rm -f index.html $(INDEX_OBJS)
-       rm -rf test-strlcpy.DSYM
-       rm -rf test-strlcat.DSYM 
-       rm -rf test-strptime.DSYM 
-       rm -rf test-mmap.DSYM 
-       rm -rf test-getsubopt.DSYM
+       rm -rf test-fgetln.dSYM
+       rm -rf test-strlcpy.dSYM
+       rm -rf test-strlcat.dSYM 
+       rm -rf test-strptime.dSYM 
+       rm -rf test-mmap.dSYM 
+       rm -rf test-getsubopt.dSYM
+       rm -rf apropos.dSYM
+       rm -rf catman.dSYM
+       rm -rf mandocdb.dSYM
+       rm -rf whatis.dSYM
 
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)
@@ -451,7 +471,6 @@ install: all
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       mkdir -p $(DESTDIR)$(MANDIR)/man8
        $(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
@@ -465,7 +484,7 @@ installcgi: all
        mkdir -p $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
-       $(INSTALL_DATA) man.cgi.css $(DESTDIR)$(HTDOCDIR)
+       $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
 installwww: www
        mkdir -p $(PREFIX)/snapshots
@@ -575,6 +594,10 @@ config.h: config.h.pre config.h.post
        rm -f config.log
        ( cat config.h.pre; \
          echo; \
+         if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
+               echo '#define HAVE_FGETLN'; \
+               rm test-fgetln; \
+         fi; \
          if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
                echo '#define HAVE_STRPTIME'; \
                rm test-strptime; \