From: Lee Duncan <ldun...@suse.com>

Several Makefile targets are missing DESTDIR, making it
hard for packagers.

Signed-off-by: Lee Duncan <ldun...@suse.com>
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 88b3529..79bad84 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ install_iface: $(IFACEFILES)
        $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
 
 install_etc: $(ETCFILES)
-       if [ ! -f /etc/iscsi/iscsid.conf ]; then \
+       if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \
                $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
                $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
        fi
@@ -137,11 +137,11 @@ install_kernel:
        $(MAKE) -C kernel install_kernel
 
 install_iname:
-       if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \
+       if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \
                echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \
                echo "***************************************************" ; \
                echo "Setting InitiatorName to `cat 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \
-               echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \
+               echo "To override edit 
$(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \
                echo "***************************************************" ; \
        fi
 
-- 
1.8.1.4

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at http://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to