===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.404
retrieving revision 1.409
diff -u -p -r1.404 -r1.409
--- mandoc/Makefile	2013/10/06 23:20:39	1.404
+++ mandoc/Makefile	2014/01/04 14:45:54	1.409
@@ -8,8 +8,8 @@
 #
 # CFLAGS	+= -DOSNAME="\"OpenBSD 5.4\""
 
-VERSION		 = 1.12.2
-VDATE		 = 05 October 2013
+VERSION		 = 1.12.3
+VDATE		 = 31 December 2013
 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
@@ -53,6 +53,15 @@ DBBIN		 = mandocdb manpage apropos
 
 all: mandoc preconv demandoc $(DBBIN)
 
+TESTSRCS	 = test-fgetln.c \
+		   test-getsubopt.c \
+		   test-mmap.c \
+		   test-ohash.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strnlen.c \
+		   test-strptime.c
+
 SRCS		 = Makefile \
 		   NEWS \
 		   TODO \
@@ -67,10 +76,14 @@ SRCS		 = Makefile \
 		   chars.in \
 		   compat_fgetln.c \
 		   compat_getsubopt.c \
+		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
+		   compat_strnlen.c \
+		   compat_strsep.c \
 		   config.h.post \
 		   config.h.pre \
+		   configure \
 		   demandoc.1 \
 		   demandoc.c \
 		   eqn.7 \
@@ -145,16 +158,10 @@ SRCS		 = Makefile \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
-		   test-fgetln.c \
-		   test-getsubopt.c \
-		   test-mmap.c \
-		   test-ohash.c \
-		   test-strlcat.c \
-		   test-strlcpy.c \
-		   test-strptime.c \
 		   tree.c \
 		   vol.c \
-		   vol.in
+		   vol.in \
+		   $(TESTSRCS)
 
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
@@ -190,8 +197,11 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
 		   compat_ohash.o \
+		   compat_strcasestr.o \
 		   compat_strlcat.o \
-		   compat_strlcpy.o
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.o
 
 arch.o: arch.in
 att.o: att.in
@@ -348,47 +358,15 @@ mdocml.md5: mdocml.tar.gz
 mdocml.tar.gz: $(SRCS)
 	mkdir -p .dist/mdocml-$(VERSION)/
 	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
-	( cd .dist/ && tar zcf ../$@ ./ )
+	chmod 755 .dist/mdocml-$(VERSION)/configure
+	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
 index.html: $(INDEX_OBJS)
 
-config.h: config.h.pre config.h.post
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	( cat config.h.pre; \
-	  echo; \
-	  echo '#define VERSION "$(VERSION)"'; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-ohash test-ohash.c >> config.log 2>&1; then \
-		echo '#define HAVE_OHASH'; \
-		rm test-ohash; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
-		echo '#define HAVE_FGETLN'; \
-		rm test-fgetln; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strptime test-strptime.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRPTIME'; \
-		rm test-strptime; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \
-		echo '#define HAVE_GETSUBOPT'; \
-		rm test-getsubopt; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRLCAT'; \
-		rm test-strlcat; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-mmap test-mmap.c >> config.log 2>&1; then \
-		echo '#define HAVE_MMAP'; \
-		rm test-mmap; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRLCPY'; \
-		rm test-strlcpy; \
-	  fi; \
-	  echo; \
-	  cat config.h.post \
-	) > $@
+	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
 .h.h.html:
 	highlight -I $< >$@