Added build system support for a man page.

This commit is contained in:
Konstantin Pavlov
2021-03-24 18:45:45 +03:00
parent 6d7c6196e1
commit b33babceda
6 changed files with 42 additions and 6 deletions

View File

@@ -18,6 +18,7 @@ cat << END
default: "$NXT_SBINDIR"
--libdir=DIRECTORY set library directory name, default: "$NXT_LIBDIR"
--incdir=DIRECTORY set includes directory name, default: "$NXT_INCDIR"
--mandir=DIRECTORY set man pages directory name, default: "$NXT_MANDIR"
--modules=DIRECTORY set modules directory name, default: "$NXT_MODULES"
--state=DIRECTORY set state directory name, default: "$NXT_STATE"
--tmp=DIRECTORY set tmp directory name, default: "$NXT_TMP"

View File

@@ -22,10 +22,11 @@ NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
NXT_MODULE_LINK = $NXT_MODULE_LINK
all: $NXT_DAEMON
all: $NXT_DAEMON manpage
.PHONY: $NXT_DAEMON
.PHONY: $NXT_DAEMON manpage
$NXT_DAEMON: $NXT_BUILD_DIR/$NXT_DAEMON
manpage: $NXT_BUILD_DIR/unitd.8
END
@@ -305,6 +306,19 @@ $NXT_BUILD_DIR/$NXT_DAEMON: $NXT_BUILD_DIR/$NXT_LIB_STATIC \\
END
# unitd man page
cat << END >> $NXT_MAKEFILE
$NXT_BUILD_DIR/unitd.8: docs/man/unitd.8.in $NXT_BUILD_DIR/nxt_auto_config.h
sed -e "s|%%ERROR_LOG_PATH%%|$NXT_LOG|" \\
-e "s|%%PID_PATH%%|$NXT_PID|" \\
-e "s|%%SOCKET_PATH%%|$NXT_CONTROL|" \\
< docs/man/unitd.8.in > \$@
END
# unit object files.
for nxt_src in $NXT_MAKE_SRCS
@@ -334,9 +348,9 @@ done
cat << END >> $NXT_MAKEFILE
.PHONY: install ${NXT_DAEMON}-install install-check
.PHONY: install ${NXT_DAEMON}-install install-check manpage-install
install: ${NXT_DAEMON}-install
install: ${NXT_DAEMON}-install manpage-install
install-check:
@test -n "\$(DESTDIR)$NXT_PREFIX" \\
@@ -352,15 +366,22 @@ ${NXT_DAEMON}-install: $NXT_DAEMON install-check
install -p $NXT_BUILD_DIR/$NXT_DAEMON \$(DESTDIR)$NXT_SBINDIR/
install -d \$(DESTDIR)$NXT_STATE
manpage-install: manpage install-check
install -d \$(DESTDIR)$NXT_MANDIR/man8
install -p $NXT_BUILD_DIR/unitd.8 \$(DESTDIR)$NXT_MANDIR/man8/
.PHONY: uninstall ${NXT_DAEMON}-uninstall
.PHONY: uninstall ${NXT_DAEMON}-uninstall manpage-uninstall
uninstall: ${NXT_DAEMON}-uninstall
uninstall: ${NXT_DAEMON}-uninstall manpage-uninstall
${NXT_DAEMON}-uninstall:
rm -f \$(DESTDIR)$NXT_SBINDIR/$NXT_DAEMON
@rmdir -p \$(DESTDIR)$NXT_SBINDIR 2>/dev/null || true
manpage-uninstall:
rm -f \$(DESTDIR)$NXT_MANDIR/man8/unitd.8
@rmdir -p \$(DESTDIR)$NXT_MANDIR/man8 2>/dev/null || true
END
cat << END >> $NXT_MAKEFILE

View File

@@ -59,6 +59,7 @@ do
--sbindir=*) NXT_SBINDIR="$value" ;;
--libdir=*) NXT_LIBDIR="$value" ;;
--incdir=*) NXT_INCDIR="$value" ;;
--mandir=*) NXT_MANDIR="$value" ;;
--modules=*) NXT_MODULES="$value" ;;
--state=*) NXT_STATE="$value" ;;
--tmp=*) NXT_TMP="$value" ;;
@@ -144,6 +145,11 @@ case "$NXT_INCDIR" in
*) NXT_INCDIR="$NXT_PREFIX$NXT_INCDIR" ;;
esac
case "$NXT_MANDIR" in
/*) ;;
*) NXT_MANDIR="$NXT_PREFIX$NXT_MANDIR" ;;
esac
case "$NXT_MODULES" in
/*) ;;
*) NXT_MODULES="$NXT_PREFIX$NXT_MODULES" ;;

View File

@@ -11,6 +11,7 @@ Unit configuration summary:
sbin directory: ............ "$NXT_SBINDIR"
lib directory: ............. "$NXT_LIBDIR"
include directory: ......... "$NXT_INCDIR"
man pages directory: ....... "$NXT_MANDIR"
modules directory: ......... "$NXT_MODULES"
state directory: ........... "$NXT_STATE"
tmp directory: ............. "$NXT_TMP"

1
configure vendored
View File

@@ -35,6 +35,7 @@ NXT_BINDIR="bin"
NXT_SBINDIR="sbin"
NXT_LIBDIR="lib"
NXT_INCDIR="include"
NXT_MANDIR="share/man"
NXT_MODULES="modules"
NXT_STATE="state"
NXT_TMP="tmp"

View File

@@ -9,6 +9,12 @@
date="" time=""
packager="Andrei Belov &lt;defan@nginx.com&gt;">
<change type="feature">
<para>
"--mandir" ./configure option to specify the directory for man page installation.
</para>
</change>
<change type="bugfix">
<para>
the router process could crash on premature TLS connection close; the bug had