]> granicus.if.org Git - sudo/commitdiff
Fold preinstall into install-plugin and pass the path to the
authorTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 13 Nov 2012 14:41:52 +0000 (09:41 -0500)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Tue, 13 Nov 2012 14:41:52 +0000 (09:41 -0500)
plugin binary to the preinstall command.

plugins/sudoers/Makefile.in

index 4abe435243dd7380f61cbb34ae5552b81a899a39..9999d8da49918c38e5de186f69f7dda7a2828e62 100644 (file)
@@ -279,13 +279,10 @@ install-includes:
 install-doc: install-dirs
        @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0755 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir)
 
-preinstall:
-       if [ X"$$SUDO_PREINSTALL_CMD" != X"" ]; then \
-           exec $$SUDO_PREINSTALL_CMD; \
-       fi
-
-install-plugin: sudoers.la install-dirs preinstall
+install-plugin: sudoers.la install-dirs
        if [ X"$(soext)" != X"" ]; then \
+           test X"$$SUDO_PREINSTALL_CMD" != X"" && \
+               $$SUDO_PREINSTALL_CMD .libs/sudoers$(soext); \
            $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -m $(shlib_mode) .libs/sudoers$(soext) $(DESTDIR)$(plugindir); \
        fi