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 094b4c98a04a77766f6ec039516ee1a7546725a6..2290d2d0e806d22ce17ee9cf6e0756cd64849ec4 100644 (file)
--- 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 7644991b0184cab9409918e0035cedc8042a8474..61ab18f5f943aded86013c449fbbd1ee792ddc12 100644 (file)
--- 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: