[packages/sudo.git] / sudo-DESTDIR.patch

diff -Nru sudo-1.6.3/Makefile.in sudo-1.6.3.new/Makefile.in
--- sudo-1.6.3/Makefile.in	Mon Mar 27 04:57:52 2000
+++ sudo-1.6.3.new/Makefile.in	Tue Mar 28 01:30:00 2000
@@ -281,27 +281,19 @@
 install: install-dirs install-binaries install-sudoers install-man
 
 install-dirs:
-	$(SHELL) $(srcdir)/mkinstalldirs $(sudodir) $(visudodir) $(sudoersdir) $(mandirsu) $(mandirform)
+	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) $(DESTDIR)$(visudodir) $(DESTDIR)$(sudoersdir) $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
 
 install-binaries: $(PROGS)
-	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 4111 -s sudo $(sudodir)/sudo
-	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0111 -s visudo $(visudodir)/visudo
+	$(INSTALL) -m 755 -s sudo $(DESTDIR)$(sudodir)/sudo
+	$(INSTALL) -m 755 -s visudo $(DESTDIR)$(visudodir)/visudo
 
 install-sudoers:
-	@if [ -f $(sudoersdir)/sudoers ]; then \
-	    echo "Setting user/group and mode on existing $(sudoersdir)/sudoers file."; \
-	    chown $(sudoers_uid) $(sudoersdir)/sudoers; \
-	    chgrp $(sudoers_gid) $(sudoersdir)/sudoers; \
-	    chmod $(sudoers_mode) $(sudoersdir)/sudoers; \
-	else \
-	    $(INSTALL) -o $(sudoers_uid) -g $(sudoers_gid) -m $(sudoers_mode) \
-		$(srcdir)/sudoers $(sudoersdir)/sudoers; \
-	fi
+	$(INSTALL) $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
 
 install-man:
-	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(mandirsu)/sudo.$(mansectsu)
-	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(mandirsu)/visudo.$(mansectsu)
-	$(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(mandirform)/sudoers.$(mansectform)
+	$(INSTALL) -m 0644 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
+	$(INSTALL) -m 0644 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
+	$(INSTALL) -m 0644 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
 @MAN_POSTINSTALL@
 
 check:
Commit	Line	Data
	1	diff -Nru sudo-1.6.3/Makefile.in sudo-1.6.3.new/Makefile.in
	2	--- sudo-1.6.3/Makefile.in Mon Mar 27 04:57:52 2000
	3	+++ sudo-1.6.3.new/Makefile.in Tue Mar 28 01:30:00 2000
	4	@@ -281,27 +281,19 @@
	5	install: install-dirs install-binaries install-sudoers install-man
	6
	7	install-dirs:
	8	- $(SHELL) $(srcdir)/mkinstalldirs $(sudodir) $(visudodir) $(sudoersdir) $(mandirsu) $(mandirform)
	9	+ $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(sudodir) $(DESTDIR)$(visudodir) $(DESTDIR)$(sudoersdir) $(DESTDIR)$(mandirsu) $(DESTDIR)$(mandirform)
	10
	11	install-binaries: $(PROGS)
	12	- $(INSTALL) -o $(install_uid) -g $(install_gid) -m 4111 -s sudo $(sudodir)/sudo
	13	- $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0111 -s visudo $(visudodir)/visudo
	14	+ $(INSTALL) -m 755 -s sudo $(DESTDIR)$(sudodir)/sudo
	15	+ $(INSTALL) -m 755 -s visudo $(DESTDIR)$(visudodir)/visudo
	16
	17	install-sudoers:
	18	- @if [ -f $(sudoersdir)/sudoers ]; then \
	19	- echo "Setting user/group and mode on existing $(sudoersdir)/sudoers file."; \
	20	- chown $(sudoers_uid) $(sudoersdir)/sudoers; \
	21	- chgrp $(sudoers_gid) $(sudoersdir)/sudoers; \
	22	- chmod $(sudoers_mode) $(sudoersdir)/sudoers; \
	23	- else \
	24	- $(INSTALL) -o $(sudoers_uid) -g $(sudoers_gid) -m $(sudoers_mode) \
	25	- $(srcdir)/sudoers $(sudoersdir)/sudoers; \
	26	- fi
	27	+ $(INSTALL) $(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
	28
	29	install-man:
	30	- $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/sudo.$(mantype) $(mandirsu)/sudo.$(mansectsu)
	31	- $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/visudo.$(mantype) $(mandirsu)/visudo.$(mansectsu)
	32	- $(INSTALL) -o $(install_uid) -g $(install_gid) -m 0444 @mansrcdir@/sudoers.$(mantype) $(mandirform)/sudoers.$(mansectform)
	33	+ $(INSTALL) -m 0644 @mansrcdir@/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
	34	+ $(INSTALL) -m 0644 @mansrcdir@/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
	35	+ $(INSTALL) -m 0644 @mansrcdir@/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
	36	@MAN_POSTINSTALL@
	37
	38	check: