]> granicus.if.org Git - sudo/commitdiff
Deal with "uname -m" having slashes in it
authorTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 12 Sep 2004 15:53:03 +0000 (15:53 +0000)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 12 Sep 2004 15:53:03 +0000 (15:53 +0000)
rm -f old sudoedit link instead of using ln -f

Makefile.in

index fe10130aa70742d28bdab828a03a19ef8cdecdcf..8f5685eccc5907f9adf595c562fb83c1e4f1764c 100644 (file)
@@ -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 ; \