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 463d07f6816364192127712df5d6ed6ad171a5b0..3044678bba2c6ed0f0f1d3b7f728b37383e44d63 100644 (file)
--- 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 9e5441831e386afea51ace6ff76e091e8daa4da1..d7687a4503167bda7b891721d770b84934ad3916 100644 (file)
--- 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