--- core-iscsi-tools-v3.5/core-iscsi/Makefile.orig	2006-03-29 23:25:43.000000000 +0200
+++ core-iscsi-tools-v3.5/core-iscsi/Makefile	2008-01-19 23:22:04.937829153 +0100
@@ -76,53 +76,53 @@
 	$(RM) -f $(DESTDIR)$(sbindir)/$(EXECUTABLES)
 
 localinstall: all
-	$(RM) -f /sbin/initiator-authd
-	install initiator_authd /sbin/initiator-authd
-	$(RM) -f /sbin/initiator-ctl
-	install initiator_ctl /sbin/initiator-ctl
+	$(RM) -f $(DESTDIR)/sbin/initiator-authd
+	install initiator_authd $(DESTDIR)/sbin/initiator-authd
+	$(RM) -f $(DESTDIR)/sbin/initiator-ctl
+	install initiator_ctl $(DESTDIR)/sbin/initiator-ctl
 
 initiator_install: all
-	$(RM) -f /sbin/initiator-authd
-	install initiator_authd /sbin/initiator-authd
-	$(RM) -f /sbin/initiator-ctl
-	install initiator_ctl /sbin/initiator-ctl
-	install initiator_iname /sbin/initiator-iname
-	install man/initiator-ctl.1 /usr/share/man/man1
-	install man/initiator.5 /usr/share/man/man5
-	install man/initiator_auth.5 /usr/share/man/man5
-	install man/iscsi_device_maps.5 /usr/share/man/man5
-
-	if [ ! -d /etc/iscsi ]; then		\
-		mkdir -p /etc/iscsi;		\
+	$(RM) -f $(DESTDIR)/sbin/initiator-authd
+	install initiator_authd $(DESTDIR)/sbin/initiator-authd
+	$(RM) -f $(DESTDIR)/sbin/initiator-ctl
+	install initiator_ctl $(DESTDIR)/sbin/initiator-ctl
+	install initiator_iname $(DESTDIR)/sbin/initiator-iname
+	install man/initiator-ctl.1 $(DESTDIR)/usr/share/man/man1
+	install man/initiator.5 $(DESTDIR)/usr/share/man/man5
+	install man/initiator_auth.5 $(DESTDIR)/usr/share/man/man5
+	install man/iscsi_device_maps.5 $(DESTDIR)/usr/share/man/man5
+
+	if [ ! -d $(DESTDIR)/etc/iscsi ]; then		\
+		mkdir -p $(DESTDIR)/etc/iscsi;		\
+	fi
+	if [ ! -d $(DESTDIR)/etc/sysconfig ]; then	\
+		mkdir -p $(DESTDIR)/etc/sysconfig;	\
+	fi
+	if [ ! -d $(DESTDIR)/etc/rc.d/init.d ]; then	\
+		mkdir -p $(DESTDIR)/etc/rc.d/init.d;	\
+	fi
+
+	install -c -m 755 scripts/install.channel $(DESTDIR)/etc/iscsi/install.channel
+	if [ ! -f $(DESTDIR)/etc/sysconfig/initiator ]; then	\
+		install -c -m 644 conf/initiator-sysconfig $(DESTDIR)/etc/sysconfig/initiator; \
 	fi
-	if [ ! -d /etc/sysconfig ]; then	\
-		mkdir -p /etc/sysconfig;	\
+	if [ ! -f $(DESTDIR)/etc/sysconfig/iscsi_device_maps ]; then \
+		install -c -m 644 conf/devicemaps-sysconfig $(DESTDIR)/etc/sysconfig/iscsi_device_maps; \
 	fi
-	if [ ! -d /etc/rc.d/init.d ]; then	\
-		mkdir -p /etc/rc.d/init.d;	\
-	fi
-
-	install -c -m 755 scripts/install.channel /etc/iscsi/install.channel
-	if [ ! -f /etc/sysconfig/initiator ]; then	\
-		install -c -m 644 conf/initiator-sysconfig /etc/sysconfig/initiator; \
-	fi
-	if [ ! -f /etc/sysconfig/iscsi_device_maps ]; then \
-		install -c -m 644 conf/devicemaps-sysconfig /etc/sysconfig/iscsi_device_maps; \
-	fi
-	if [ ! -f /etc/sysconfig/initiator_auth ]; then \
-		install -c -m 600 conf/initiator_auth-sysconfig /etc/sysconfig/initiator_auth; \
+	if [ ! -f $(DESTDIR)/etc/sysconfig/initiator_auth ]; then \
+		install -c -m 600 conf/initiator_auth-sysconfig $(DESTDIR)/etc/sysconfig/initiator_auth; \
 	fi
 	
-	install -c -m 755 scripts/rc.initiator /etc/rc.d/init.d/initiator
-	install -c -m 755 scripts/proc.iscsi-map-channel /sbin/proc.iscsi-map-channel
-	install -c -m 755 scripts/sysfs.iscsi-map-channel /sbin/sysfs.iscsi-map-channel
-	install -c -m 755 scripts/iscsi-map-channel /sbin/iscsi-map-channel
-	install -c -m 755 scripts/proc.iscsi-unmap-channel /sbin/proc.iscsi-unmap-channel
-	install -c -m 755 scripts/sysfs.iscsi-unmap-channel /sbin/sysfs.iscsi-unmap-channel
-	install -c -m 755 scripts/iscsi-unmap-channel /sbin/iscsi-unmap-channel
-	install -c -m 755 scripts/iscsi-remap-channel /sbin/iscsi-remap-channel
-	install -c -m 755 scripts/iscsi-mount /sbin/iscsi-mount
-	install -c -m 755 scripts/iscsi-umount /sbin/iscsi-umount
+	install -c -m 755 scripts/rc.initiator $(DESTDIR)/etc/rc.d/init.d/initiator
+	install -c -m 755 scripts/proc.iscsi-map-channel $(DESTDIR)/sbin/proc.iscsi-map-channel
+	install -c -m 755 scripts/sysfs.iscsi-map-channel $(DESTDIR)/sbin/sysfs.iscsi-map-channel
+	install -c -m 755 scripts/iscsi-map-channel $(DESTDIR)/sbin/iscsi-map-channel
+	install -c -m 755 scripts/proc.iscsi-unmap-channel $(DESTDIR)/sbin/proc.iscsi-unmap-channel
+	install -c -m 755 scripts/sysfs.iscsi-unmap-channel $(DESTDIR)/sbin/sysfs.iscsi-unmap-channel
+	install -c -m 755 scripts/iscsi-unmap-channel $(DESTDIR)/sbin/iscsi-unmap-channel
+	install -c -m 755 scripts/iscsi-remap-channel $(DESTDIR)/sbin/iscsi-remap-channel
+	install -c -m 755 scripts/iscsi-mount $(DESTDIR)/sbin/iscsi-mount
+	install -c -m 755 scripts/iscsi-umount $(DESTDIR)/sbin/iscsi-umount
 
 uninstall:
 	rm -rf /sbin/initiator-authd