From: short <>
Date: Wed, 20 Aug 2003 17:31:08 +0000 (+0000)
Subject: Fixed installation by non-root user; DESTDIR is required in such case.
X-Git-Tag: lufs_0_9_6_captive1~37
X-Git-Url: http://git.jankratochvil.net/?p=lufs.git;a=commitdiff_plain;h=f28bc765d0843fa022edcec7f86d90da0f92f077

Fixed installation by non-root user; DESTDIR is required in such case.
---

diff --git a/util/Makefile.am b/util/Makefile.am
index 16c1288..cf0144c 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -14,6 +14,6 @@ install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)/etc
 	ln -fs $(DESTDIR)$(bindir)/auto.sshfs $(DESTDIR)/etc/auto.sshfs
 	ln -fs $(DESTDIR)$(bindir)/auto.ftpfs $(DESTDIR)/etc/auto.ftpfs
-	if [ "$(LSUID)" ]; then chmod a+s $(DESTDIR)$(bindir)/lufsmnt $(DESTDIR)$(bindir)/lufsumount; fi
+	if [ "$(LSUID)" -a -z "$(DESTDIR)" ]; then chmod a+s $(DESTDIR)$(bindir)/lufsmnt-bin $(DESTDIR)$(bindir)/lufsumount; fi
 	if [ -f /etc/auto.master -a "$(AUTOFS_INSTALL)" -a ! "`cat $(DESTDIR)/etc/auto.master | grep \"auto.ftpfs\"`" ]; then mkdir -p $(DESTDIR)/mnt/net/ssh $(DESTDIR)/mnt/net/ftp; echo -e "/mnt/net/ssh\t/etc/auto.sshfs\t--timeout=60\n/mnt/net/ftp\t/etc/auto.ftpfs\t--timeout=60\n" >> $(DESTDIR)/etc/auto.master; $(DESTDIR)/etc/init.d/autofs restart; fi