diff options
| author | Lee Duncan <lduncan@suse.com> | 2022-03-17 11:53:37 -0700 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2022-03-17 11:53:37 -0700 |
| commit | b2270ed5b33b6f10b5b09a15c0b3b57b8a2e1ce0 (patch) | |
| tree | 6d36c8ecdec2c6c313cbff1f85c7108d843eac30 /Makefile | |
| parent | 58809ff1148989f9ed5bfcd135b80015aaddb9a4 (diff) | |
| download | open-iscsi-b2270ed5b33b6f10b5b09a15c0b3b57b8a2e1ce0.tar.gz | |
General Makefile/README cleanup
Cleaning up the Makefiles, in preperation for adding the
ability to move files out of /etc/iscsi more easily. Also,
clean up the README file by updating it with help updated
help messages, alignment, and those pesky spaces at the ends of lines.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -9,7 +9,7 @@ DESTDIR ?= SED = /usr/bin/sed prefix = /usr -exec_prefix = / +exec_prefix = sbindir = $(exec_prefix)/sbin bindir = $(exec_prefix)/bin mandir = $(prefix)/share/man @@ -22,17 +22,17 @@ MANPAGES = doc/iscsid.8 doc/iscsiadm.8 doc/iscsi_discovery.8 \ iscsiuio/docs/iscsiuio.8 doc/iscsi_fw_login.8 doc/iscsi-iname.8 \ doc/iscsistart.8 doc/iscsi-gen-initiatorname.8 PROGRAMS = usr/iscsid usr/iscsiadm utils/iscsi-iname iscsiuio/src/unix/iscsiuio \ - usr/iscsistart + usr/iscsistart SCRIPTS = utils/iscsi_discovery utils/iscsi_fw_login utils/iscsi_offload \ - utils/iscsi-gen-initiatorname + utils/iscsi-gen-initiatorname INSTALL = install -ETCFILES = etc/iscsid.conf +CONFIGFILE = etc/iscsid.conf IFACEFILES = etc/iface.example RULESFILES = utils/50-iscsi-firmware-login.rules SYSTEMDFILES = etc/systemd/iscsi.service \ - etc/systemd/iscsi-init.service \ - etc/systemd/iscsid.service etc/systemd/iscsid.socket \ - etc/systemd/iscsiuio.service etc/systemd/iscsiuio.socket + etc/systemd/iscsi-init.service \ + etc/systemd/iscsid.service etc/systemd/iscsid.socket \ + etc/systemd/iscsiuio.service etc/systemd/iscsiuio.socket export DESTDIR prefix INSTALL @@ -104,24 +104,24 @@ clean: install_etc install_iface install_doc install_iname install: install_programs install_doc install_etc \ - install_initd install_iname install_iface install_libopeniscsiusr + install_systemd install_iname install_iface install_libopeniscsiusr install_user: install_programs install_doc install_etc \ - install_initd install_iname install_iface + install_systemd install_iname install_iface install_udev_rules: $(INSTALL) -d $(DESTDIR)$(rulesdir) - $(INSTALL) -m 644 $(RULESFILES) $(DESTDIR)/$(rulesdir) + $(INSTALL) -m 644 $(RULESFILES) $(DESTDIR)$(rulesdir) for f in $(RULESFILES); do \ - p=$(DESTDIR)/$(rulesdir)/$${f##*/}; \ + p=$(DESTDIR)$(rulesdir)/$${f##*/}; \ $(SED) -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ done install_systemd: $(INSTALL) -d $(DESTDIR)$(systemddir)/system - $(INSTALL) -m 644 $(SYSTEMDFILES) $(DESTDIR)/$(systemddir)/system + $(INSTALL) -m 644 $(SYSTEMDFILES) $(DESTDIR)$(systemddir)/system for f in $(SYSTEMDFILES); do \ - p=$(DESTDIR)/$(systemddir)/system/$${f##*/}; \ + p=$(DESTDIR)$(systemddir)/system/$${f##*/}; \ $(SED) -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ done @@ -129,7 +129,7 @@ install_programs: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir) for f in $(SCRIPTS); do \ - p=$(DESTDIR)/$(sbindir)/$${f##*/}; \ + p=$(DESTDIR)$(sbindir)/$${f##*/}; \ $(SED) -i -e 's:@SBINDIR@:$(sbindir):' $$p; \ done @@ -157,7 +157,7 @@ install_iface: $(IFACEFILES) $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi/ifaces $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi/ifaces -install_etc: $(ETCFILES) +install_etc: $(CONFIGFILE) if [ ! -f $(DESTDIR)/etc/iscsi/iscsid.conf ]; then \ $(INSTALL) -d $(DESTDIR)$(etcdir)/iscsi ; \ $(INSTALL) -m 644 $^ $(DESTDIR)$(etcdir)/iscsi ; \ |