From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s751j36v005281
	for <source@mdocml.bsd.lv>; Mon, 4 Aug 2014 21:45:03 -0400 (EDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s751j2sV032731;
	Mon, 4 Aug 2014 21:45:02 -0400 (EDT)
Date: Mon, 4 Aug 2014 21:45:02 -0400 (EDT)
Message-Id: <201408050145.s751j2sV032731@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Various minor corrections: * Do not unconditionally use 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Various minor corrections:
* Do not unconditionally use -I/usr/local/include and -L/usr/local/lib.
* Do not install programs and libs root-writeable.
* Add missing test-strcasestr.c and test-strsep.c to TESTSRCS.
* Add missing cgi.h.example and mandoc_html.3 to SRCS.
* Add missing mandoc_html.3.html to WWW_MANS.

Modified Files:
--------------
    mdocml:
        Makefile

Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.426
retrieving revision 1.427
diff -LMakefile -LMakefile -u -p -r1.426 -r1.427
--- Makefile
+++ Makefile
@@ -34,7 +34,7 @@ VERSION		 = 1.13.0
 #
 CFLAGS	 	+= -DUSE_WCHAR
 
-CFLAGS		+= -I/usr/local/include -g -DHAVE_CONFIG_H
+CFLAGS		+= -g -DHAVE_CONFIG_H
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 BINDIR		 = $(PREFIX)/bin
@@ -44,9 +44,9 @@ MANDIR		 = $(PREFIX)/man
 EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
 
 INSTALL		 = install
-INSTALL_PROGRAM	 = $(INSTALL) -m 0755
+INSTALL_PROGRAM	 = $(INSTALL) -m 0555
 INSTALL_DATA	 = $(INSTALL) -m 0444
-INSTALL_LIB	 = $(INSTALL) -m 0644
+INSTALL_LIB	 = $(INSTALL) -m 0444
 INSTALL_SOURCE	 = $(INSTALL) -m 0644
 INSTALL_MAN	 = $(INSTALL_DATA)
 
@@ -63,6 +63,12 @@ DBBIN		 = makewhatis manpage apropos
 #
 #CFLAGS		+= -DUSE_MANPATH
 
+# On some systems, SQLite3 may be installed below /usr/local.
+# In that case, uncomment the following two lines.
+#
+#CFLAGS		+= -I/usr/local/include
+#DBLIB		+= -L/usr/local/lib
+
 # OpenBSD has the ohash functions in libutil.
 # Comment the following line if your system doesn't.
 #
@@ -91,7 +97,7 @@ CGIBINDIR	 = $(WWWPREFIX)/cgi-bin
 # === END OF USER SETTINGS =============================================
 
 ALLBIN		 = mandoc preconv demandoc $(DBBIN)
-DBLIB		+= -L/usr/local/lib -lsqlite3
+DBLIB		+= -lsqlite3
 
 all: $(ALLBIN)
 
@@ -100,9 +106,11 @@ TESTSRCS	 = test-fgetln.c \
 		   test-mmap.c \
 		   test-ohash.c \
 		   test-reallocarray.c \
+		   test-strcasestr.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
-		   test-strptime.c
+		   test-strptime.c \
+		   test-strsep.c
 
 SRCS		 = LICENSE \
 		   Makefile \
@@ -115,6 +123,7 @@ SRCS		 = LICENSE \
 		   att.c \
 		   att.in \
 		   cgi.c \
+		   cgi.h.example \
 		   chars.c \
 		   chars.in \
 		   compat_fgetln.c \
@@ -166,6 +175,7 @@ SRCS		 = LICENSE \
 		   mandoc_aux.c \
 		   mandoc_aux.h \
 		   mandoc_char.7 \
+		   mandoc_html.3 \
 		   mandocdb.c \
 		   manpage.c \
 		   manpath.c \
@@ -328,6 +338,7 @@ WWW_MANS	 = apropos.1.html \
 		   mandoc.1.html \
 		   preconv.1.html \
 		   mandoc.3.html \
+		   mandoc_html.3.html \
 		   mansearch.3.html \
 		   tbl.3.html \
 		   mandoc.db.5.html \
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv