diff --git a/MANIFEST b/MANIFEST index b1f916c28..f775c29e4 100644 --- a/MANIFEST +++ b/MANIFEST @@ -63,7 +63,7 @@ etc/init.d/sudo.conf.in etc/sudo.pp examples/Makefile.in examples/pam.conf -examples/sudo.conf +examples/sudo.conf.in examples/sudo_logsrvd.conf examples/sudoers examples/syslog.conf diff --git a/configure b/configure index 1ff27230a..0d601c6fe 100755 --- a/configure +++ b/configure @@ -27632,7 +27632,7 @@ elif test X"$TMPFILES_D" != X""; then fi -ac_config_files="$ac_config_files Makefile doc/Makefile examples/Makefile include/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers" +ac_config_files="$ac_config_files Makefile doc/Makefile examples/Makefile examples/sudo.conf include/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers" cat >confcache <<\_ACEOF @@ -28631,6 +28631,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "examples/sudo.conf") CONFIG_FILES="$CONFIG_FILES examples/sudo.conf" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "lib/iolog/Makefile") CONFIG_FILES="$CONFIG_FILES lib/iolog/Makefile" ;; "lib/logsrv/Makefile") CONFIG_FILES="$CONFIG_FILES lib/logsrv/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3eea639da..832a7dfa3 100644 --- a/configure.ac +++ b/configure.ac @@ -4574,7 +4574,7 @@ elif test X"$TMPFILES_D" != X""; then AC_CONFIG_FILES([etc/init.d/sudo.conf]) fi -AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile include/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers]) +AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile examples/sudo.conf include/Makefile lib/iolog/Makefile lib/logsrv/Makefile lib/util/Makefile lib/util/util.exp logsrvd/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/group_file/Makefile plugins/system_group/Makefile plugins/sudoers/Makefile plugins/sudoers/sudoers]) AC_OUTPUT diff --git a/examples/Makefile.in b/examples/Makefile.in index c5e58b923..950f7f150 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -48,7 +48,7 @@ install_gid = 0 SHELL = @SHELL@ -EXAMPLES = $(srcdir)/pam.conf $(srcdir)/sudo.conf $(srcdir)/sudoers \ +EXAMPLES = $(srcdir)/pam.conf sudo.conf $(srcdir)/sudoers \ $(srcdir)/syslog.conf VERSION = @PACKAGE_VERSION@ @@ -61,6 +61,9 @@ depend: Makefile: $(srcdir)/Makefile.in cd $(top_builddir) && ./config.status --file examples/Makefile +sudo.conf: $(srcdir)/sudo.conf.in + cd $(top_builddir) && ./config.status --file examples/sudo.conf + pre-install: install: install-doc diff --git a/examples/sudo.conf b/examples/sudo.conf.in similarity index 95% rename from examples/sudo.conf rename to examples/sudo.conf.in index c605bb5b5..3b044f35f 100644 --- a/examples/sudo.conf +++ b/examples/sudo.conf.in @@ -10,7 +10,7 @@ # # Sudo plugins: # -# The plugin_path is relative to ${prefix}/libexec unless fully qualified. +# 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. # The plugin_options are optional. @@ -42,7 +42,7 @@ Plugin sudoers_io sudoers.so # The compiled-in value is usually sufficient and should only be changed # if you rename or move the sudo_noexec.so file. # -#Path noexec /usr/libexec/sudo_noexec.so +#Path noexec @plugindir@/sudo_noexec.so # # Core dumps: