diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-08-05 01:45:02 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-08-05 01:45:02 +0000 |
| commit | 6422b087c829e37220be1d223f12a00c8a86393b (patch) | |
| tree | 467c31b27493a40838dbe8dfb79dfc85b10ec6c1 /Makefile | |
| parent | 9f4fcfc3c40eb212ee80d9b98e4d099a9b6b8272 (diff) | |
| download | mandoc-6422b087c829e37220be1d223f12a00c8a86393b.tar.gz mandoc-6422b087c829e37220be1d223f12a00c8a86393b.tar.zst mandoc-6422b087c829e37220be1d223f12a00c8a86393b.zip | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 23 |
1 files changed, 17 insertions, 6 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.426 2014/08/05 01:07:00 schwarze Exp $ +# $Id: Makefile,v 1.427 2014/08/05 01:45:02 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -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 \ |