diff options
| author | Lee Duncan <lduncan@suse.com> | 2022-04-03 12:56:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-03 12:56:00 -0700 |
| commit | 5ba7e358d6767fb4026382ef0044beb284933cd8 (patch) | |
| tree | 4537820275cd677a0e476b55fc5efdf420a1019f | |
| parent | 7cc15a8133ca5fbd9ea0e16296371a7219f329f4 (diff) | |
| parent | 6f3a99110bccc73177dc2d5056b1ff652ef19c56 (diff) | |
| download | open-iscsi-5ba7e358d6767fb4026382ef0044beb284933cd8.tar.gz | |
Merge pull request #334 from gonzoleeman/fix-destdir-install-for-iname
Fix destdir install for iname
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/Makefile | 6 | ||||
| -rw-r--r-- | iscsiuio/Makefile.am | 10 |
3 files changed, 9 insertions, 9 deletions
@@ -9,7 +9,7 @@ DESTDIR ?= prefix = /usr exec_prefix = mandir = $(prefix)/share/man -etcdir = $(DESTDIR)/etc +etcdir = /etc SBINDIR = $(exec_prefix)/sbin HOMEDIR = $(etcdir)/iscsi diff --git a/doc/Makefile b/doc/Makefile index 7d39dad..9ed025d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -24,20 +24,18 @@ MANPAGES_SOURCES = iscsi_discovery.8 \ iscsi_fw_login.8 \ iscsi-iname.8 \ iscsistart.8 -MANPAGES_SOURCES_ISCSIUIO = $(TOPDIR)/iscsiuio/docs/iscsiuio.8 MANPAGES_TEMPLATES = iscsid.8.template \ iscsiadm.8.template \ iscsi-gen-initiatorname.8 MANPAGES_GENERATED = $(MANPAGES_TEMPLATES:.template=) MANPAGES_DEST = $(addprefix $(MAN8DIR)/,$(MANPAGES_GENERATED)) \ $(addprefix $(MAN8DIR)/,$(MANPAGES_SOURCES)) -MANPAGES_DEST_ISCSIUIO = $(addprefix $(MAN8DIR)/,$(notdir $(MANPAGES_SOURCES_ISCSIUIO))) all: $(MANPAGES_GENERATED) install: install_doc -install_doc: $(MAN8DIR) $(MANPAGES_DEST) $(MANPAGES_DEST_ISCSIUIO) +install_doc: $(MAN8DIR) $(MANPAGES_DEST) $(MANPAGES_GENERATED): %.8: %.8.template $(SED) -e 's:@HOMEDIR@:$(HOMEDIR):' -e 's:@DBROOT@:$(DBROOT):' $? > $@ @@ -45,8 +43,6 @@ $(MANPAGES_GENERATED): %.8: %.8.template $(MANPAGES_DEST): $(MAN8DIR)/%: % $(INSTALL) -m 644 $? $@ -$(MANPAGES_DEST_ISCSIUIO): $(MAN8DIR)/%: $(TOPDIR)/iscsiuio/docs/% - $(INSTALL) -m 644 $? $@ $(MAN8DIR): [ -d $@ ] || $(INSTALL) -d $@ diff --git a/iscsiuio/Makefile.am b/iscsiuio/Makefile.am index 97f478f..4f928f7 100644 --- a/iscsiuio/Makefile.am +++ b/iscsiuio/Makefile.am @@ -17,10 +17,14 @@ logdir = /etc/logrotate.d install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install-man install-log install-brcm -install-man: - cat docs/iscsiuio.8 | GZIP=$(GZIP_ENV) gzip -c > iscsiuio.8.gz +install-man: $(DESTDIR)$(mandir)/man8/iscsiuio.8.gz + +iscsiuio.8.gz: docs/iscsiuio.8 + gzip $(GZIP_ENV) -c < $? > $@ + +$(DESTDIR)$(mandir)/man8/iscsiuio.8.gz: iscsiuio.8.gz $(INSTALL) -d $(DESTDIR)$(mandir)/man8/ - $(INSTALL_DATA) iscsiuio.8.gz $(DESTDIR)$(mandir)/man8/ + $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man8/ install-log: $(INSTALL) -d $(DESTDIR)$(logdir)/ |