Rename PLUGINDIR -> plugindir

diff --git a/configure b/configure
index f6664a92a96f9a1fc7471412391531619b824d0f..b9634e651a6e1123b363c0a3c03713fa1fabf931 100755 (executable)
--- a/configure
+++ b/configure
@@ -682,7 +682,7 @@ OBJEXT
 EXEEXT
 ac_ct_CC
 CC
-PLUGINDIR
+plugindir
 pam_login_service
 pam_session
 editor
@@ -3123,7 +3123,7 @@ nsswitch_conf=/etc/nsswitch.conf
 secure_path="not set"
 pam_session=on
 pam_login_service=sudo
-PLUGINDIR="$libexecdir/sudo"
+plugindir="$libexecdir/sudo"
 DIGEST=digest.lo
 devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev"
 #
@@ -6035,7 +6035,7 @@ if test "${with_plugindir+set}" = set; then :
                ;;
     no)                as_fn_error $? "\"--without-plugindir not supported.\"" "$LINENO" 5
                ;;
-    *)         PLUGINDIR="$with_plugindir"
+    *)         plugindir="$with_plugindir"
                ;;
 esac
 fi
@@ -26913,11 +26913,11 @@ while test X"$sesh_file" != X"$_sesh_file"; do
     eval sesh_file="$_sesh_file"
 done
 
-# Update exec_prefix in PLUGINDIR
-_PLUGINDIR=
-while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
-    _PLUGINDIR="$PLUGINDIR"
-    eval PLUGINDIR="$_PLUGINDIR"
+# Update exec_prefix in plugindir
+_plugindir=
+while test X"$plugindir" != X"$_plugindir"; do
+    _plugindir="$plugindir"
+    eval plugindir="$_plugindir"
 done
 exec_prefix="$oexec_prefix"
 
@@ -26953,7 +26953,7 @@ EOF
 fi
 if test X"$enable_shared" != X"no"; then
     cat >>confdefs.h <<EOF
-#define _PATH_SUDO_PLUGIN_DIR "$PLUGINDIR/"
+#define _PATH_SUDO_PLUGIN_DIR "$plugindir/"
 EOF
 
 

diff --git a/configure.ac b/configure.ac
index 5a584b81bfbe924553b981774fc7c263fb14ad78..65b145049df3bfa1325c286defac478180813bd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,7 @@ AC_SUBST([secure_path])
 AC_SUBST([editor])
 AC_SUBST([pam_session])
 AC_SUBST([pam_login_service])
-AC_SUBST([PLUGINDIR])
+AC_SUBST([plugindir])
 #
 # Begin initial values for man page substitution
 #
@@ -199,7 +199,7 @@ nsswitch_conf=/etc/nsswitch.conf
 secure_path="not set"
 pam_session=on
 pam_login_service=sudo
-PLUGINDIR="$libexecdir/sudo"
+plugindir="$libexecdir/sudo"
 DIGEST=digest.lo
 devsearch="/dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev"
 #
@@ -1253,7 +1253,7 @@ AC_ARG_WITH(plugindir, [AS_HELP_STRING([--with-plugindir=DIR], [set directory to
                ;;
     no)                AC_MSG_ERROR(["--without-plugindir not supported."])
                ;;
-    *)         PLUGINDIR="$with_plugindir"
+    *)         plugindir="$with_plugindir"
                ;;
 esac])
 
@@ -4394,11 +4394,11 @@ while test X"$sesh_file" != X"$_sesh_file"; do
     eval sesh_file="$_sesh_file"
 done
 
-# Update exec_prefix in PLUGINDIR
-_PLUGINDIR=
-while test X"$PLUGINDIR" != X"$_PLUGINDIR"; do
-    _PLUGINDIR="$PLUGINDIR"
-    eval PLUGINDIR="$_PLUGINDIR"
+# Update exec_prefix in plugindir
+_plugindir=
+while test X"$plugindir" != X"$_plugindir"; do
+    _plugindir="$plugindir"
+    eval plugindir="$_plugindir"
 done
 exec_prefix="$oexec_prefix"
 
@@ -4424,7 +4424,7 @@ else
     SUDO_DEFINE_UNQUOTED(_PATH_SUDO_SESH, NULL)
 fi
 if test X"$enable_shared" != X"no"; then
-    SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$PLUGINDIR/")
+    SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, "$plugindir/")
     AC_DEFINE(ENABLE_SUDO_PLUGIN_API, 1, [Define to 1 to enable sudo's plugin interface.])
 else
     SUDO_DEFINE_UNQUOTED(_PATH_SUDO_PLUGIN_DIR, NULL)

diff --git a/doc/sudo.conf.man.in b/doc/sudo.conf.man.in
index 406c37d70b04c754824a8d8c5b56e2febcc68f16..65ac7f4ddb80611c6dc58eb3a40a4c46072b3be9 100644 (file)
--- a/doc/sudo.conf.man.in
+++ b/doc/sudo.conf.man.in
@@ -117,7 +117,7 @@ specified by the
 \fIplugin_dir\fR
 \fRPath\fR
 setting, which defaults to
-\fI@PLUGINDIR@\fR.
+\fI@plugindir@\fR.
 In other words:
 .nf
 .sp
@@ -130,7 +130,7 @@ is equivalent to:
 .nf
 .sp
 .RS 6n
-Plugin sudoers_policy @PLUGINDIR@/sudoers.so
+Plugin sudoers_policy @plugindir@/sudoers.so
 .RE
 .fi
 .PP
@@ -295,7 +295,7 @@ plugin_dir
 The default directory to use when searching for plugins
 that are specified without a fully qualified path name.
 The default value is
-\fI@PLUGINDIR@\fR.
+\fI@plugindir@\fR.
 .if \n(SL \{\
 .TP 10n
 sesh
@@ -650,7 +650,7 @@ front end configuration
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @PLUGINDIR@ unless
+# The plugin_path is relative to @plugindir@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.

diff --git a/doc/sudo.conf.mdoc.in b/doc/sudo.conf.mdoc.in
index 534b62634507ffa06c8db84ac0b6c7cd306ec298..c01b0164fe1e747c4d0151e6a77368d2e67887e2 100644 (file)
--- a/doc/sudo.conf.mdoc.in
+++ b/doc/sudo.conf.mdoc.in
@@ -114,7 +114,7 @@ specified by the
 .Em plugin_dir
 .Li Path
 setting, which defaults to
-.Pa @PLUGINDIR@ .
+.Pa @plugindir@ .
 In other words:
 .Bd -literal -offset indent
 Plugin sudoers_policy sudoers.so
@@ -122,7 +122,7 @@ Plugin sudoers_policy sudoers.so
 .Pp
 is equivalent to:
 .Bd -literal -offset indent
-Plugin sudoers_policy @PLUGINDIR@/sudoers.so
+Plugin sudoers_policy @plugindir@/sudoers.so
 .Ed
 .Pp
 If the plugin was compiled statically into the
@@ -270,7 +270,7 @@ The default value is
 The default directory to use when searching for plugins
 that are specified without a fully qualified path name.
 The default value is
-.Pa @PLUGINDIR@ .
+.Pa @plugindir@ .
 .if \n(SL \{\
 .It sesh
 The fully-qualified path to the
@@ -587,7 +587,7 @@ front end configuration
 #   Debug sudo /var/log/sudo_debug all@warn
 #   Set disable_coredump true
 #
-# The plugin_path is relative to @PLUGINDIR@ unless
+# The plugin_path is relative to @plugindir@ unless
 #   fully qualified.
 # The plugin_name corresponds to a global symbol in the plugin
 #   that contains the plugin interface structure.

diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index 31986c82368ce7482188dd1267e4ad8c13528ea6..326f596a38d429742b3021666cb42c0f853f074b 100644 (file)
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -3971,7 +3971,7 @@ A string containing a
 group plugin with optional arguments.
 The string should consist of the plugin
 path, either fully-qualified or relative to the
-\fI@PLUGINDIR@\fR
+\fI@plugindir@\fR
 directory, followed by any configuration arguments the plugin requires.
 These arguments (if any) will be passed to the plugin's initialization function.
 If arguments are present, the string must be enclosed in double quotes
@@ -4416,7 +4416,7 @@ Defaults setting.
 The argument to
 \fIgroup_plugin\fR
 should consist of the plugin path, either fully-qualified or relative to the
-\fI@PLUGINDIR@\fR
+\fI@plugindir@\fR
 directory, followed by any configuration options the plugin requires.
 These options (if specified) will be passed to the plugin's initialization
 function.

diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index c0a3bba4493355a91a94d2b41529511730e977bd..c7d6a1420e74b06ae68105f09c2854049bb6f15e 100644 (file)
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -3720,7 +3720,7 @@ A string containing a
 group plugin with optional arguments.
 The string should consist of the plugin
 path, either fully-qualified or relative to the
-.Pa @PLUGINDIR@
+.Pa @plugindir@
 directory, followed by any configuration arguments the plugin requires.
 These arguments (if any) will be passed to the plugin's initialization function.
 If arguments are present, the string must be enclosed in double quotes
@@ -4122,7 +4122,7 @@ Defaults setting.
 The argument to
 .Em group_plugin
 should consist of the plugin path, either fully-qualified or relative to the
-.Pa @PLUGINDIR@
+.Pa @plugindir@
 directory, followed by any configuration options the plugin requires.
 These options (if specified) will be passed to the plugin's initialization
 function.

diff --git a/plugins/group_file/Makefile.in b/plugins/group_file/Makefile.in
index 711bc50cc8a3972c5f7d36d81c8dae1b929c1649..1b9cb6c0b6c0ce2e1401ce3a9279cfa01f4f5ac7 100644 (file)
--- a/plugins/group_file/Makefile.in
+++ b/plugins/group_file/Makefile.in
@@ -87,7 +87,7 @@ sysconfdir = @sysconfdir@
 libexecdir = @libexecdir@
 datarootdir = @datarootdir@
 localstatedir = @localstatedir@
-plugindir = @PLUGINDIR@
+plugindir = @plugindir@
 
 # File mode and map file to use for shared libraries/objects
 shlib_enable = @SHLIB_ENABLE@

diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index 91b97d9b6b7a98d006426585440d9640f0bb4e07..e4409fc09e0a287efbee71b79b6eb391e724dcdb 100644 (file)
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -86,7 +86,7 @@ sysconfdir = @sysconfdir@
 libexecdir = @libexecdir@
 datarootdir = @datarootdir@
 localstatedir = @localstatedir@
-plugindir = @PLUGINDIR@
+plugindir = @plugindir@
 
 # File mode and map file to use for shared libraries/objects
 shlib_enable = @SHLIB_ENABLE@

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 16050804a162a4fc801593df1d8a4d2faf3f18f4..8edb17b31452b1aec110e7deb6513a977152418b 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -124,7 +124,7 @@ shlib_map = sudoers.map
 shlib_opt = sudoers.opt
 
 # Directory in which to install the sudoers plugin
-plugindir = @PLUGINDIR@
+plugindir = @plugindir@
 
 # Directory in which to install the sudoers file
 sudoersdir = $(sysconfdir)

diff --git a/plugins/system_group/Makefile.in b/plugins/system_group/Makefile.in
index cfff84d2182ee0d1decfb42ddc42755dc8856d82..a4c5bd834d32d8b2688962da72af2868206a1d86 100644 (file)
--- a/plugins/system_group/Makefile.in
+++ b/plugins/system_group/Makefile.in
@@ -87,7 +87,7 @@ sysconfdir = @sysconfdir@
 libexecdir = @libexecdir@
 datarootdir = @datarootdir@
 localstatedir = @localstatedir@
-plugindir = @PLUGINDIR@
+plugindir = @plugindir@
 
 # File mode and map file to use for shared libraries/objects
 shlib_enable = @SHLIB_ENABLE@