From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 20 Jan 2002 00:43:16 +0000 (+0000)
Subject: Don't need a '/' between $(DESTDIR) and a directory.
X-Git-Tag: SUDO_1_6_6~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=839cd24a8093e3d0aa2673dbac56d2a1b3f8a421;p=sudo

Don't need a '/' between $(DESTDIR) and a directory.
---

diff --git a/Makefile.binary b/Makefile.binary
index 1cf6901c9..8da97c198 100644
--- a/Makefile.binary
+++ b/Makefile.binary
@@ -83,23 +83,23 @@ all: $(PROGS)
 install: install-dirs install-binaries install-sudoers install-man
 
 install-dirs:
-	$(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)/$(sudodir) \
-	    $(DESTDIR)/$(visudodir) $(DESTDIR)/$(sudoersdir) \
-	    $(DESTDIR)/$(mandirsu) $(DESTDIR)/$(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 sudo $(DESTDIR)/$(sudodir)/sudo
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)/$(visudodir)/visudo
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 sudo $(DESTDIR)$(sudodir)/sudo
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
 
 install-sudoers:
-	test -f $(DESTDIR)/$(sudoersdir)/sudoers || \
+	test -f $(DESTDIR)$(sudoersdir)/sudoers || \
 	    $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \
-		$(srcdir)/sudoers $(DESTDIR)/$(sudoersdir)/sudoers
+		$(srcdir)/sudoers $(DESTDIR)$(sudoersdir)/sudoers
 
 install-man:
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudo.$(mantype) $(DESTDIR)/$(mandirsu)/sudo.$(mansectsu)
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/visudo.$(mantype) $(DESTDIR)/$(mandirsu)/visudo.$(mansectsu)
-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudoers.$(mantype) $(DESTDIR)/$(mandirform)/sudoers.$(mansectform)
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudo.$(mantype) $(DESTDIR)$(mandirsu)/sudo.$(mansectsu)
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/visudo.$(mantype) $(DESTDIR)$(mandirsu)/visudo.$(mansectsu)
+	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0444 $(srcdir)/sudoers.$(mantype) $(DESTDIR)$(mandirform)/sudoers.$(mansectform)
 
 check:
 	@echo nothing to check