Install sudo_plugin.h as part of "make install" and make other install

targets callable from the top-level Makefile

diff --git a/Makefile.in b/Makefile.in
index eb3b81b71065abdb1b2b08c634d45d683556ea8b..d5b1a97aaeac8adc9084363d4e83498d02da72b4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,11 +20,11 @@ devdir = @devdir@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
-SUBDIRS = compat src plugins/sample plugins/sudoers doc
+SUBDIRS = compat src plugins/sample plugins/sudoers include doc
 
 VERSION = @PACKAGE_VERSION@
 
-all install: config.status
+all install install-dirs install-binaries install-includes install-man install-plugin: config.status
        for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@) || break; done
 
 ChangeLog:

diff --git a/compat/Makefile.in b/compat/Makefile.in
index 090d7fbe3a27bff4a82d8b6838eb5a48c970ee1e..e766e5c8cd35e57b415b434025b655d520c52527 100644 (file)
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -99,10 +99,16 @@ utimes.lo: $(compat)/utimes.c $(incdir)/compat.h $(compat)/utime.h $(top_builddi
 
 install:
 
+install-dirs:
+
 install-binaries:
 
+install-includes:
+
 install-man:
 
+install-plugin:
+
 check:
        @echo nothing to check
 

diff --git a/configure b/configure
index 568dcd10855b67760c005292c4f34ea450230c40..b9fe42920a2b5f1379017539cd5994becb44d732 100755 (executable)
--- a/configure
+++ b/configure
@@ -26603,7 +26603,7 @@ EOF
     exec_prefix="$oexec_prefix"
 fi
 
-ac_config_files="$ac_config_files Makefile compat/Makefile doc/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/sudoers/Makefile"
+ac_config_files="$ac_config_files Makefile compat/Makefile doc/Makefile include/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/sudoers/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -27162,6 +27162,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "compat/Makefile") CONFIG_FILES="$CONFIG_FILES compat/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "src/sudo_usage.h") CONFIG_FILES="$CONFIG_FILES src/sudo_usage.h" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "plugins/sample/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/sample/Makefile" ;;

diff --git a/configure.in b/configure.in
index 52df0d4326345249406a3a9acc15d67f5876a167..478b53d2f0cd731eabd9475b1f3078a22748d9b0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2737,7 +2737,7 @@ dnl
 dnl Substitute into the Makefile and man pages
 dnl
 dnl AC_CONFIG_FILES([doc/sudo.man doc/visudo.man doc/sudoers.man doc/sudoers.ldap.man doc/sudoreplay.man src/Makefile src/sudo_usage.h])
-AC_CONFIG_FILES([Makefile compat/Makefile doc/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/sudoers/Makefile])
+AC_CONFIG_FILES([Makefile compat/Makefile doc/Makefile include/Makefile src/sudo_usage.h src/Makefile plugins/sample/Makefile plugins/sudoers/Makefile])
 AC_OUTPUT
 
 dnl

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6ccec69a4d2bb05fc7a902f894bc9ff8a074fa96..f9d81c02f702792956827d212949d569df77982c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -154,6 +154,8 @@ install-dirs:
 
 install-binaries:
 
+install-includes:
+
 install-man: install-dirs
        $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
        @rm -f $(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu)
@@ -165,6 +167,8 @@ install-man: install-dirs
        @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 @mansrcdir@/sudoers.ldap.$(mantype) $(DESTDIR)$(mandirform)/sudoers.ldap.$(mansectform)
 @MAN_POSTINSTALL@
 
+install-plugin:
+
 check:
        @echo nothing to check
 

diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index 8d975c2413cd4a6603035787a0d0b4eda22f1223..e348a7931a3122d62e0a50190a7165b721536b88 100644 (file)
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -92,6 +92,8 @@ install-dirs:
 
 install-binaries:
 
+install-includes:
+
 install-man:
 
 install-plugin: install-dirs sample_plugin.la

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 1beba9b856cf2a37ea34461bbec00c4c6700c87e..f658fadc0b6bf66e099eb06edb03a30b706bac4f 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -285,11 +285,13 @@ install-binaries: visudo sudoreplay install-dirs
        $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s sudoreplay $(DESTDIR)$(replaydir)/sudoreplay
        $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
 
-install-plugin: sudoers.la install-dirs
-       $(LIBTOOL) --mode=install $(INSTALL) sudoers.la $(DESTDIR)$(plugindir)
+install-includes:
 
 install-man:
 
+install-plugin: sudoers.la install-dirs
+       $(LIBTOOL) --mode=install $(INSTALL) sudoers.la $(DESTDIR)$(plugindir)
+
 install-sudoers: install-dirs
        test -f $(DESTDIR)$(sudoersdir)/sudoers || \
            $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \

diff --git a/src/Makefile.in b/src/Makefile.in
index 8d5bcf17fc4de9223b1fcba9eaa6091a24071a0d..b015d8aa0207292724fbb90115aad5b60737f9b1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -142,9 +142,13 @@ install-binaries: install-dirs $(PROGS)
        ln $(DESTDIR)$(bindir)/sudo $(DESTDIR)$(bindir)/sudoedit
        if [ -f sesh ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s sesh $(DESTDIR)$(libexecdir)/sesh; fi
 
+install-includes:
+
 install-noexec: install-dirs sudo_noexec.la
        if [ -f .libs/$(noexecfile) ]; then $(INSTALL) -O $(install_uid) -G $(install_gid) -M 0755 .libs/$(noexecfile) $(DESTDIR)$(noexecdir); fi
 
+install-plugin:
+
 check:
        @echo nothing to check