|
 |
e509a42 |
From 9ef01a7d13358e96627ae1d263fea5537c4ed6f7 Mon Sep 17 00:00:00 2001
|
|
|
e509a42 |
From: Lee Duncan <lduncan@suse.com>
|
|
|
e509a42 |
Date: Wed, 29 Jan 2014 11:21:49 +0100
|
|
|
e509a42 |
Subject: [PATCH] Add missing DESTDIR
|
|
|
e509a42 |
|
|
|
e509a42 |
Several Makefile targets are missing DESTDIR, making it
|
|
|
e509a42 |
hard for packagers.
|
|
|
e509a42 |
|
|
|
e509a42 |
Signed-off-by: Lee Duncan <lduncan@suse.com>
|
|
|
e509a42 |
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
|
e509a42 |
---
|
|
|
e509a42 |
Makefile | 6 +++---
|
|
|
e509a42 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
e509a42 |
|
|
|
e509a42 |
diff --git a/Makefile b/Makefile
|
|
|
e509a42 |
index 88b3529..79bad84 100644
|
|
|
e509a42 |
--- a/Makefile
|
|
|
e509a42 |
+++ b/Makefile
|
|
|
e509a42 |
@@ -124,7 +124,7 @@ install_iface: $(IFACEFILES)
|
|
|
e509a42 |
$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
|
|
|
e509a42 |
|
|
|
e509a42 |
install_etc: $(ETCFILES)
|
|
|
e509a42 |
- if [ ! -f /etc/iscsi/iscsid.conf ]; then \
|
|
|
e509a42 |
+ if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \
|
|
|
e509a42 |
$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
|
|
|
e509a42 |
$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
|
|
|
e509a42 |
fi
|
|
|
e509a42 |
@@ -137,11 +137,11 @@ install_kernel:
|
|
|
e509a42 |
$(MAKE) -C kernel install_kernel
|
|
|
e509a42 |
|
|
|
e509a42 |
install_iname:
|
|
|
e509a42 |
- if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \
|
|
|
e509a42 |
+ if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \
|
|
|
e509a42 |
echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \
|
|
|
e509a42 |
echo "***************************************************" ; \
|
|
|
e509a42 |
echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \
|
|
|
e509a42 |
- echo "To override edit /etc/iscsi/initiatorname.iscsi" ; \
|
|
|
e509a42 |
+ echo "To override edit $(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \
|
|
|
e509a42 |
echo "***************************************************" ; \
|
|
|
e509a42 |
fi
|
|
|
e509a42 |
|
|
|
e509a42 |
--
|
|
|
e509a42 |
1.8.3.1
|
|
|
e509a42 |
|