* mdocml: sort user settings; no functional change
@ 2014-08-05 1:07 schwarze
0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2014-08-05 1:07 UTC (permalink / raw)
To: source
Log Message:
-----------
sort user settings; no functional change
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.395.2.20
retrieving revision 1.395.2.21
diff -LMakefile -LMakefile -u -p -r1.395.2.20 -r1.395.2.21
--- Makefile
+++ Makefile
@@ -19,6 +19,8 @@ VERSION = 1.12.4
# === USER SETTINGS ====================================================
+# --- user settings relevant for all builds ----------------------------
+
# Specify this if you want to hard-code the operating system to appear
# in the lower-left hand corner of -mdoc manuals.
#
@@ -32,22 +34,15 @@ VERSION = 1.12.4
#
CFLAGS += -DUSE_WCHAR
-# If your system has manpath(1), uncomment this. This is most any
-# system that's not OpenBSD or NetBSD. If uncommented, apropos(1),
-# and mandocdb(8) will popen(3) manpath(1) to get the MANPATH
-# variable.
-#CFLAGS += -DUSE_MANPATH
-
CFLAGS += -g -DHAVE_CONFIG_H
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
-WWWPREFIX = /var/www
-HTDOCDIR = $(WWWPREFIX)/htdocs
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include/mandoc
LIBDIR = $(PREFIX)/lib/mandoc
MANDIR = $(PREFIX)/man
EXAMPLEDIR = $(PREFIX)/share/examples/mandoc
+
INSTALL = install
INSTALL_PROGRAM = $(INSTALL) -m 0755
INSTALL_DATA = $(INSTALL) -m 0444
@@ -55,13 +50,26 @@ INSTALL_LIB = $(INSTALL) -m 0644
INSTALL_SOURCE = $(INSTALL) -m 0644
INSTALL_MAN = $(INSTALL_DATA)
+# --- user settings related to database support ------------------------
+
+# If you want to build without database support, for example to avoid
+# the dependency on Berkeley DB, comment the following line.
+#
+DBBIN = apropos mandocdb whatis
+
# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
# apropos.
-# However, if you don't have -ldb at all (or it's not native), then
-# comment out apropos and mandocdb.
#
#DBLIB = -ldb
-DBBIN = apropos mandocdb whatis
+
+# If your system has manpath(1), uncomment this. This is most any
+# system that's not OpenBSD or NetBSD. If uncommented, apropos(1)
+# and mandocdb(8) will use manpath(1) to get the MANPATH variable.
+#
+#CFLAGS += -DUSE_MANPATH
+
+WWWPREFIX = /var/www
+HTDOCDIR = $(WWWPREFIX)/htdocs
# === END OF USER SETTINGS =============================================
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 2+ messages in thread
* mdocml: sort user settings; no functional change
@ 2014-08-05 1:07 schwarze
0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2014-08-05 1:07 UTC (permalink / raw)
To: source
Log Message:
-----------
sort user settings; no functional change
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.425
retrieving revision 1.426
diff -LMakefile -LMakefile -u -p -r1.425 -r1.426
--- Makefile
+++ Makefile
@@ -19,6 +19,8 @@ VERSION = 1.13.0
# === USER SETTINGS ====================================================
+# --- user settings relevant for all builds ----------------------------
+
# Specify this if you want to hard-code the operating system to appear
# in the lower-left hand corner of -mdoc manuals.
#
@@ -32,28 +34,15 @@ VERSION = 1.13.0
#
CFLAGS += -DUSE_WCHAR
-# If your system has manpath(1), uncomment this. This is most any
-# system that's not OpenBSD or NetBSD. If uncommented, manpage(1) and
-# makewhatis(8) will use manpath(1) to get the MANPATH variable.
-#CFLAGS += -DUSE_MANPATH
-
-# If your system does not support static binaries, comment this,
-# for example on Mac OS X.
-STATIC = -static
-# Linux requires -pthread to statically link with libdb.
-#STATIC += -pthread
-
CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
-WWWPREFIX = /var/www
-HTDOCDIR = $(WWWPREFIX)/htdocs
-CGIBINDIR = $(WWWPREFIX)/cgi-bin
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include/mandoc
LIBDIR = $(PREFIX)/lib/mandoc
MANDIR = $(PREFIX)/man
EXAMPLEDIR = $(PREFIX)/share/examples/mandoc
+
INSTALL = install
INSTALL_PROGRAM = $(INSTALL) -m 0755
INSTALL_DATA = $(INSTALL) -m 0444
@@ -61,22 +50,48 @@ INSTALL_LIB = $(INSTALL) -m 0644
INSTALL_SOURCE = $(INSTALL) -m 0644
INSTALL_MAN = $(INSTALL_DATA)
+# --- user settings related to database support ------------------------
+
# If you want to build without database support, for example to avoid
-# the dependency on SQLite3, comment the following two lines.
-DBLIB = -L/usr/local/lib -lsqlite3
+# the dependency on SQLite3, comment the following line.
+#
DBBIN = makewhatis manpage apropos
-# To build man.cgi, copy cgi.h.example to cgi.h, edit it, and
-# either enable the following line or run "make man.cgi" by hand.
-#DBBIN += man.cgi
+# If your system has manpath(1), uncomment this. This is most any
+# system that's not OpenBSD or NetBSD. If uncommented, apropos(1)
+# and makewhatis(8) will use manpath(1) to get the MANPATH variable.
+#
+#CFLAGS += -DUSE_MANPATH
# OpenBSD has the ohash functions in libutil.
# Comment the following line if your system doesn't.
+#
DBLIB += -lutil
+# --- user settings related to man.cgi ---------------------------------
+
+# To build man.cgi, copy cgi.h.example to cgi.h, edit it,
+# and enable the following line.
+#
+#DBBIN += man.cgi
+
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
+#
+STATIC = -static
+
+# Linux requires -pthread for statical linking.
+#
+#STATIC += -pthread
+
+WWWPREFIX = /var/www
+HTDOCDIR = $(WWWPREFIX)/htdocs
+CGIBINDIR = $(WWWPREFIX)/cgi-bin
+
# === END OF USER SETTINGS =============================================
ALLBIN = mandoc preconv demandoc $(DBBIN)
+DBLIB += -L/usr/local/lib -lsqlite3
all: $(ALLBIN)
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-05 1:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-05 1:07 mdocml: sort user settings; no functional change schwarze
-- strict thread matches above, loose matches on Subject: below --
2014-08-05 1:07 schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).