From: Uwe Hermann <redacted>
Date: Sun, 22 Jul 2012 16:19:15 +0000 (+0200)
Subject: s/make/$(MAKE)/ to fix build on FreeBSD.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~8
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=4836f7921c83b4713e897ee8c38e48a4433325c4;p=sigrok-firmware-fx2lafw.git

s/make/$(MAKE)/ to fix build on FreeBSD.

On FreeBSD (and possibly) elsewhere you'd invoke the build via "gmake",
thus hardcoded "make" invokations in our Makefiles will break the build.

Use $(MAKE) everywhere, which always does the right thing.
---

diff --git a/fx2lib/Makefile b/fx2lib/Makefile
index 463d07f6..3044678b 100644
--- a/fx2lib/Makefile
+++ b/fx2lib/Makefile
@@ -6,11 +6,11 @@ TAG=HEAD
 .PHONY: all docs
 
 all:
-	make -C lib
+	$(MAKE) -C lib
 
 docs:
 	doxygen docs/docs.conf
-	make -C docs/intro
+	$(MAKE) -C docs/intro
 
 dist: all docs
 	mkdir -p build	
diff --git a/fx2lib/lib/fx2.mk b/fx2lib/lib/fx2.mk
index 9e544183..d7687a45 100644
--- a/fx2lib/lib/fx2.mk
+++ b/fx2lib/lib/fx2.mk
@@ -82,7 +82,7 @@ bix: $(BUILDDIR)/$(BASENAME).bix
 iic: $(BUILDDIR)/$(BASENAME).iic
 
 $(FX2LIBDIR)/lib/fx2.lib: $(FX2LIBDIR)/lib/*.c $(FX2LIBDIR)/lib/*.a51
-	make -C $(FX2LIBDIR)/lib
+	$(MAKE) -C $(FX2LIBDIR)/lib
 
 $(BUILDDIR):
 	mkdir -p $(BUILDDIR)
@@ -111,5 +111,5 @@ clean:
 	rm -f $(BUILDDIR)/*.{asm,ihx,lnk,lst,map,mem,rel,rst,sym,adb,cdb,bix}
 
 clean-all: clean
-	make -C $(FX2LIBDIR)/lib clean
+	$(MAKE) -C $(FX2LIBDIR)/lib clean