Attachment #517230 for bug #645910

View | Details | Raw Unified | Return to bug 645910
Collapse All | Expand All




rulesdir = $(etcdir)/udev/rules.d

MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \
		doc/iscsi-iname.8 \
		doc/iscsistart.8
PROGRAMS = usr/iscsid usr/iscsiadm usr/iscsistart utils/iscsi-iname
SCRIPTS = utils/iscsi_discovery utils/iscsi_offload \
		  utils/iscsi-gen-initiatorname
INSTALL = install
ETCFILES = etc/iscsid.conf

# ugh, auto-detection is evil
# Gentoo maintains their own init.d stuff
install_initd:
	if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \
		$(MAKE) install_initd_debian ; \
	elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \
		$(MAKE) install_initd_redhat ; \
	elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \
		$(MAKE) install_initd_suse ; \
	fi


	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces

install_etc: $(ETCFILES)
	if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \
		$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
		$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
	fi

	$(INSTALL) -m 644 $^ $(DESTDIR)$(mandir)/man8

install_iname:
	if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \
		echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \
		echo "***************************************************" ; \
		echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/etc/iscsi/initiatorname.iscsi`" ; \
		echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \
		echo "***************************************************" ; \
	fi


Lines 69-77 Link Here

(-)open-iscsi-2.0.876.old/usr/Makefile (-2 / +2 lines)
69	iscsistart.o statics.o	69	iscsistart.o statics.o
70	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)	70	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lrt $(ISCSI_LIB)
71	clean:	71	clean:
72	rm -f *.o $(PROGRAMS) .depend $(LIBSYS)	72	$(RM) *.o $(PROGRAMS) .depend $(LIBSYS)
73		73
74	depend:	74	depend:
75	gcc $(CFLAGS) -M `ls *.c` > .depend	75	$(CC) $(CFLAGS) -M `ls *.c` > .depend
76		76
77	-include .depend	77	-include .depend

Lines 10-18 Link Here

(-)open-iscsi-2.0.876.old/utils/Makefile (-2 / +2 lines)
10	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@	10	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(DBM_LIB) -o $@
11		11
12	clean:	12	clean:
13	rm -f *.o $(PROGRAMS) .depend	13	$(RM) *.o $(PROGRAMS) .depend
14		14
15	depend:	15	depend:
16	gcc $(CFLAGS) -M `ls *.c` > .depend	16	$(CC) $(CFLAGS) -M `ls *.c` > .depend
17		17
18	-include .depend	18	-include .depend

Lines 41-51 Link Here

(-)open-iscsi-2.0.876.old/utils/fwparam_ibft/Makefile (-2 / +2 lines)
41	all: $(OBJS)	41	all: $(OBJS)
42		42
43	clean:	43	clean:
44	rm -f *.o $(CLEANFILES) .depend	44	$(RM) *.o $(CLEANFILES) .depend
45		45
46	$(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h	46	$(OBJS): prom_parse.tab.h prom_parse.h fwparam_ibft.h
47		47
48	depend:	48	depend:
49	gcc $(CFLAGS) -M `ls *.c` > .depend	49	$(CC) $(CFLAGS) -M `ls *.c` > .depend
50		50
51	-include .depend	51	-include .depend

Lines 8-16 Link Here

(-)open-iscsi-2.0.876.old/utils/sysdeps/Makefile (-2 / +2 lines)
8	all: $(SYSDEPS_OBJS)	8	all: $(SYSDEPS_OBJS)
9		9
10	clean:	10	clean:
11	rm -f *.o .depend	11	$(RM) *.o .depend
12		12
13	depend:	13	depend:
14	gcc $(CFLAGS) -M `ls *.c` > .depend	14	$(CC) $(CFLAGS) -M `ls *.c` > .depend
15		15
16	-include .depend	16	-include .depend

Return to bug 645910

Lines 16-25 Link Here

(-)open-iscsi-2.0.876.old/Makefile (-11 / +11 lines)
16	rulesdir = $(etcdir)/udev/rules.d	16	rulesdir = $(etcdir)/udev/rules.d
17		17
18	MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \	18	MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \
19	iscsiuio/docs/iscsiuio.8 doc/iscsi_fw_login.8 doc/iscsi-iname.8 \	19	doc/iscsi-iname.8 \
20	doc/iscsistart.8	20	doc/iscsistart.8
21	PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname iscsiuio/src/unix/iscsiuio	21	PROGRAMS = usr/iscsid usr/iscsiadm usr/iscsistart utils/iscsi-iname
22	SCRIPTS = utils/iscsi_discovery utils/iscsi_fw_login utils/iscsi_offload \	22	SCRIPTS = utils/iscsi_discovery utils/iscsi_offload \
23	utils/iscsi-gen-initiatorname	23	utils/iscsi-gen-initiatorname
24	INSTALL = install	24	INSTALL = install
25	ETCFILES = etc/iscsid.conf	25	ETCFILES = etc/iscsid.conf
Lines 104-114 Link Here
104	# ugh, auto-detection is evil	104	# ugh, auto-detection is evil
105	# Gentoo maintains their own init.d stuff	105	# Gentoo maintains their own init.d stuff
106	install_initd:	106	install_initd:
107	if [ -f /etc/debian_version ]; then \	107	if [ -f $(DESTDIR)$(etcdir)/debian_version ]; then \
108	$(MAKE) install_initd_debian ; \	108	$(MAKE) install_initd_debian ; \
109	elif [ -f /etc/redhat-release ]; then \	109	elif [ -f $(DESTDIR)$(etcdir)/redhat-release ]; then \
110	$(MAKE) install_initd_redhat ; \	110	$(MAKE) install_initd_redhat ; \
111	elif [ -f /etc/SuSE-release ]; then \	111	elif [ -f $(DESTDIR)$(etcdir)/SuSE-release ]; then \
112	$(MAKE) install_initd_suse ; \	112	$(MAKE) install_initd_suse ; \
113	fi	113	fi
114		114
Lines 135-141 Link Here
135	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces	135	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces
136		136
137	install_etc: $(ETCFILES)	137	install_etc: $(ETCFILES)
138	if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \	138	if [ ! -f $(DESTDIR)$(etcdir)/iscsi/iscsid.conf ]; then \
139	$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \	139	$(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \
140	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \	140	$(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \
141	fi	141	fi
Lines 145-155 Link Here
145	$(INSTALL) -m 644 $^ $(DESTDIR)$(mandir)/man8	145	$(INSTALL) -m 644 $^ $(DESTDIR)$(mandir)/man8
146		146
147	install_iname:	147	install_iname:
148	if [ ! -f $(DESTDIR)/etc/iscsi/initiatorname.iscsi ]; then \	148	if [ ! -f $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ]; then \
149	echo "InitiatorName=`$(DESTDIR)/sbin/iscsi-iname`" > $(DESTDIR)/etc/iscsi/initiatorname.iscsi ; \	149	echo "InitiatorName=`$(DESTDIR)$(sbindir)/iscsi-iname`" > $(DESTDIR)$(etcdir)/iscsi/initiatorname.iscsi ; \
150	echo "***************************************************" ; \	150	echo "***************************************************" ; \
151	echo "Setting InitiatorName to `cat $(DESTDIR)/etc/iscsi/initiatorname.iscsi`" ; \	151	echo "Setting InitiatorName to `cat $(DESTDIR)$(etcdir)/etc/iscsi/initiatorname.iscsi`" ; \
152	echo "To override edit $(DESTDIR)/etc/iscsi/initiatorname.iscsi" ; \	152	echo "To override edit $(etcdir)/iscsi/initiatorname.iscsi" ; \
153	echo "***************************************************" ; \	153	echo "***************************************************" ; \
154	fi	154	fi
155		155