From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 6 Oct 2014 20:23:41 +0000 (-0600)
Subject: Use INSTALL_OWNER instead of -O/-G flags so we can work with the
X-Git-Tag: SUDO_1_8_12^2~162
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7574a344ee86f0ed8e63d5ebfcd0cd7163d03ce;p=sudo

Use INSTALL_OWNER instead of -O/-G flags so we can work with the
autotools install-sh too.  Bug #669
---

diff --git a/Makefile.in b/Makefile.in
index 094b4c98a..2290d2d0e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -266,7 +266,7 @@ install-nls:
 			    ln -s $$lang $(DESTDIR)$(localedir)/$$lang$(LOCALEDIR_SUFFIX); \
 			fi; \
 		    fi; \
-		    $(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \
+		    $(INSTALL) $(INSTALL_OWNER) -m 0644 $$podir/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$$domain.mo; \
 		done; \
 		echo ""; \
 	    done; \
diff --git a/include/Makefile.in b/include/Makefile.in
index 7644991b0..61ab18f5f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -27,6 +27,7 @@ cross_compiling = @CROSS_COMPILING@
 
 # Our install program supports extra flags...
 INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
+INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
 
 # Where to install things...
 prefix = @prefix@
@@ -65,7 +66,7 @@ install-binaries:
 install-doc:
 
 install-includes: install-dirs
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -m 0644 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir)
+	$(INSTALL) $(INSTALL_OWNER) -m 0644 $(srcdir)/sudo_plugin.h $(DESTDIR)$(includedir)
 
 install-plugin: