diff options
| author | Alejandro Colomar <alx@nginx.com> | 2023-03-27 13:43:37 +0200 |
|---|---|---|
| committer | Alejandro Colomar <alx@nginx.com> | 2023-03-29 00:40:40 +0200 |
| commit | 5ba79b9b524ef746bc3269520c3f6b893f39275c (patch) | |
| tree | d2c81fb988fe3c371ff5aa969abd7bf82459927a /auto | |
| parent | e242b1454dff7a6be17ed2e2c06884fec528ad1b (diff) | |
| download | unit-5ba79b9b524ef746bc3269520c3f6b893f39275c.tar.gz unit-5ba79b9b524ef746bc3269520c3f6b893f39275c.tar.bz2 | |
Renamed --libstatedir to --statedir.
In BSD systems, it's usually </var/db> or some other dir under </var>
that is not </var/lib>, so $statedir is a more generic name. See
hier(7).
Reported-by: Andrei Zeliankou <zelenkov@nginx.com>
Reported-by: Zhidao Hong <z.hong@f5.com>
Reviewed-by: Konstantin Pavlov <thresh@nginx.com>
Reviewed-by: Andrew Clayton <a.clayton@nginx.com>
Cc: Liam Crilly <liam@nginx.com>
Signed-off-by: Alejandro Colomar <alx@nginx.com>
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/help | 4 | ||||
| -rw-r--r-- | auto/make | 4 | ||||
| -rw-r--r-- | auto/options | 8 | ||||
| -rw-r--r-- | auto/summary | 2 |
4 files changed, 9 insertions, 9 deletions
@@ -21,14 +21,14 @@ cat << END --datarootdir=DIR default: "\$prefix/share" --mandir=DIR default: "\$datarootdir/man" --localstatedir=DIR default: "\$prefix/var" - --libstatedir=DIR default: "\$localstatedir/lib/unit" + --statedir=DIR default: "\$localstatedir/lib/unit" --runstatedir=DIR default: "\$localstatedir/run/unit" --logdir=DIR default: "\$localstatedir/log/unit" --tmpdir=DIR default: "/tmp" --incdir=DIR [deprecated] synonym for --includedir --modules=DIR [deprecated] synonym for --modulesdir - --state=DIR [deprecated] synonym for --libstatedir + --state=DIR [deprecated] synonym for --statedir --tmp=DIR [deprecated] synonym for --tmpdir --pid=FILE set pid filename, default: "\$runstatedir/unit.pid" @@ -366,8 +366,8 @@ ${NXT_DAEMON}-install: $NXT_DAEMON install-check test -d \$(DESTDIR)$NXT_SBINDIR \ || install -d \$(DESTDIR)$NXT_SBINDIR install -p $NXT_BUILD_DIR/$NXT_DAEMON \$(DESTDIR)$NXT_SBINDIR/ - test -d \$(DESTDIR)$NXT_LIBSTATEDIR \ - || install -d \$(DESTDIR)$NXT_LIBSTATEDIR + test -d \$(DESTDIR)$NXT_STATEDIR \ + || install -d \$(DESTDIR)$NXT_STATEDIR test -d \$(DESTDIR)$NXT_LOGDIR \ || install -d \$(DESTDIR)$NXT_LOGDIR test -d \$(DESTDIR)$NXT_RUNSTATEDIR \ diff --git a/auto/options b/auto/options index 802ab701..5487be7f 100644 --- a/auto/options +++ b/auto/options @@ -74,10 +74,10 @@ do --datarootdir=*) NXT_DATAROOTDIR="$value" ;; --mandir=*) NXT_MANDIR="$value" ;; --localstatedir=*) NXT_LOCALSTATEDIR="$value" ;; - --libstatedir=*) NXT_LIBSTATEDIR="$value" ;; + --statedir=*) NXT_STATEDIR="$value" ;; --state=*) - >&2 echo "[warn] option --state is deprecated; use --libstatedir" - NXT_LIBSTATEDIR="$value" + >&2 echo "[warn] option --state is deprecated; use --statedir" + NXT_STATEDIR="$value" ;; --logdir=*) NXT_LOGDIR="$value" ;; --runstatedir=*) NXT_RUNSTATEDIR="$value" ;; @@ -160,7 +160,7 @@ NXT_DATAROOTDIR="${NXT_DATAROOTDIR-"$NXT_PREFIX/share"}" NXT_MANDIR="${NXT_MANDIR-"$NXT_DATAROOTDIR/man"}" NXT_LOCALSTATEDIR="${NXT_LOCALSTATEDIR-"$NXT_PREFIX/var"}" -NXT_LIBSTATEDIR="${NXT_LIBSTATEDIR-"$NXT_LOCALSTATEDIR/lib/unit"}" +NXT_STATEDIR="${NXT_STATEDIR-"$NXT_LOCALSTATEDIR/lib/unit"}" NXT_LOGDIR="${NXT_LOGDIR-"$NXT_LOCALSTATEDIR/log/unit"}" NXT_LOG="${NXT_LOG-"$NXT_LOGDIR/unit.log"}" NXT_RUNSTATEDIR="${NXT_RUNSTATEDIR-"$NXT_LOCALSTATEDIR/run/unit"}" diff --git a/auto/summary b/auto/summary index eff4881d..fabe3b10 100644 --- a/auto/summary +++ b/auto/summary @@ -13,7 +13,7 @@ Unit configuration summary: include directory: ......... "$NXT_INCLUDEDIR" man pages directory: ....... "$NXT_MANDIR" modules directory: ......... "$NXT_MODULESDIR" - state directory: ........... "$NXT_LIBSTATEDIR" + state directory: ........... "$NXT_STATEDIR" tmp directory: ............. "$NXT_TMPDIR" pid file: .................. "$NXT_PID" |