From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 23 Jul 2010 13:12:03 +0000 (-0400)
Subject: Install sudoers2ldif in the doc dir
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c016ecf00643840c6409b9c8346a6d3d70975ac0;p=sudo

Install sudoers2ldif in the doc dir
---

diff --git a/doc/Makefile.in b/doc/Makefile.in
index a4a066459..f415a40e8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -164,7 +164,7 @@ install-doc: install-dirs
 install-plugin:
 
 uninstall:
-	-rm -f	$(DESTDIR)$(mandirsu)/sudo.$(mansectsu) \
+	-rm -f	$(DESTDIR)$(docdir) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu) \
 		$(DESTDIR)$(mandirsu)/sudoedit.$(mansectsu) \
 		$(DESTDIR)$(mandirsu)/sudo_plugin.$(mansectsu) \
 		$(DESTDIR)$(mandirsu)/sudoreplay.$(mansectsu) \
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index df48edb24..64f4dd321 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -30,6 +30,7 @@ authdir = $(srcdir)/auth
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 incdir = $(top_srcdir)/include
+docdir = @docdir@
 
 # For out of tree builds
 VPATH = $(devdir):$(srcdir):$(srcdir)/auth
@@ -246,12 +247,12 @@ testsudoers.o: $(srcdir)/testsudoers.c $(SUDODEP) $(srcdir)/parse.h $(incdir)/li
 tsgetgrpw.o: $(srcdir)/tsgetgrpw.c $(SUDODEP)
 visudo.o: $(srcdir)/visudo.c $(SUDODEP) $(devdir)/gram.h
 
-install: install-dirs install-plugin install-binaries install-sudoers
+install: install-dirs install-plugin install-binaries install-sudoers install-doc
 
 install-dirs:
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir) \
 	    $(DESTDIR)$(visudodir) $(DESTDIR)$(replaydir) \
-	    $(DESTDIR)$(sudoersdir)
+	    $(DESTDIR)$(sudoersdir) $(DESTDIR)$(docdir)
 
 install-binaries: visudo sudoreplay install-dirs
 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 sudoreplay $(DESTDIR)$(replaydir)/sudoreplay
@@ -259,8 +260,8 @@ install-binaries: visudo sudoreplay install-dirs
 
 install-includes:
 
-# XXX - install sudoers2ldif in docdir
 install-doc:
+	@LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir)
 
 install-plugin: sudoers.la install-dirs
 	$(LIBTOOL) --mode=install --quiet $(INSTALL) sudoers.la $(DESTDIR)$(plugindir)