summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorLee Duncan <lduncan@suse.com>2022-04-10 11:20:24 -0700
committerGitHub <noreply@github.com>2022-04-10 11:20:24 -0700
commit7de11c99ba1e4b9581376d5a9f805b007c133c43 (patch)
treef3e6cbdc482ef15c39cdf9588a14434f4f25cc76 /usr
parentd169831fd5c5afa9c3f5c0b17789791dfcea5208 (diff)
parentddcc4334c0c89547452510cd07046088c4839950 (diff)
downloadopen-iscsi-7de11c99ba1e4b9581376d5a9f805b007c133c43.tar.gz
Merge pull request #333 from thesamesam/master
Build system tweaks from downstream
Diffstat (limited to 'usr')
-rw-r--r--usr/Makefile4
-rw-r--r--usr/fwparam_ibft/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr/Makefile b/usr/Makefile
index 8f91ee1..3fc2248 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -41,7 +41,7 @@ endif
DBROOT ?= $(etcdir)/iscsi
HOMEDIR ?= $(etcdir)/iscsi
-PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG ?= /usr/bin/pkg-config
CFLAGS ?= -O2 -g
WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
@@ -121,7 +121,7 @@ clean:
$(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) clean
depend:
- gcc $(CFLAGS) -M `ls *.c` > .depend
+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
$(MAKE) $(MFLAGS) -C $(FW_BOOT_DIR) depend
-include .depend
diff --git a/usr/fwparam_ibft/Makefile b/usr/fwparam_ibft/Makefile
index 6739f41..768b573 100644
--- a/usr/fwparam_ibft/Makefile
+++ b/usr/fwparam_ibft/Makefile
@@ -42,11 +42,11 @@ LDFLAGS += -L$(TOPDIR)/libopeniscsiusr -liscsiusr
all: $(OBJS)
clean:
- rm -f $(CLEANFILES) .depend
+ $(RM) $(CLEANFILES) .depend
$(OBJS): prom_parse.tab.h prom_parse.h
depend:
- gcc $(CFLAGS) -M `ls *.c` > .depend
+ $(CC) $(CFLAGS) -M `ls *.c` > .depend
-include .depend