From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sun, 12 Sep 2004 15:53:03 +0000 (+0000)
Subject: Deal with "uname -m" having slashes in it
X-Git-Tag: SUDO_1_6_8p1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75866326a2e265830a808683d6d6698d17bc414a;p=sudo

Deal with "uname -m" having slashes in it
rm -f old sudoedit link instead of using ln -f
---

diff --git a/Makefile.in b/Makefile.in
index fe10130aa..8f5685ecc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -302,7 +302,8 @@ install-dirs:
 
 install-binaries: $(PROGS)
 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo
-	ln -f $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
+	rm -f $(DESTDIR)$(sudodir)/sudoedit
+	ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
 
 	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
 
@@ -360,7 +361,7 @@ dist:
 
 bindist:
 	( \
-	  ARCH=`uname -m`+`uname -sr|sed 's/ /_/g'` ; \
+	  ARCH=`uname -m|sed 's:/:_:g'`+`uname -sr|sed 's/ /_/g'` ; \
 	  mkdir tmp.$$ARCH ; \
 	  tdir=tmp.$$ARCH/sudo-$(VERSION) ; \
 	  mkdir $$tdir ; \