summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2019-06-05 09:17:38 -0700
committerLee Duncan <lduncan@suse.com>2019-06-05 09:17:38 -0700
commit655b636528ebf0934d79dc952a6af86047f45af3 (patch)
tree03d70f66fea54cd1e7f78d5eac7ac8a1573f8f28 /Makefile
parentf71581bd641dc26d330cb8b97e5ec272dd08f811 (diff)
downloadopen-iscsi-655b636528ebf0934d79dc952a6af86047f45af3.tar.gz
Handle systemd disablement correctly in iscsiuio
Commit c1870ae6dddb7bc2dbdc750df68edbbe1a80763f added systemd support to iscsiuio, but it was not integrated with the autoconf script there, so this commit rectifies that. Now one can build without systemd support, from the top, using: $ make OPTFLAGS="... -DNO_SYSTEMD ... which now works for both iscsid and iscsiuio.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9a33774..6cd8790 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ endif
# export systemd disablement if set
ifneq ($(NO_SYSTEMD),)
export NO_SYSTEMD
+WITHOUT_ARG = --without-systemd
+else
+WITHOUT_ARG =
endif
# Random comments:
@@ -70,7 +73,7 @@ user: iscsiuio/Makefile
@echo "Read README file for detailed information."
iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in
- cd iscsiuio; ./configure
+ cd iscsiuio; ./configure $(WITHOUT_ARG)
iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile.am
cd iscsiuio; autoreconf --install