allow AN*_LIB_FILE variables to be overridden, to avoid make install …

…error
dstndstn · Sep 3, 2018 · d977bdb · d977bdb
1 parent 7608cff
commit d977bdb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -320,10 +320,12 @@ snapshot-libkd:
 .PHONY: snapshot-libkd
 
 test:
-	$(MAKE) -C blind test
+	$(MAKE) -C util
+	$(MAKE) -C libkd
 	$(MAKE) -C util  test
 	$(MAKE) -C catalogs test
 	$(MAKE) -C libkd test
+	$(MAKE) -C blind test
 .PHONY: test
 
 clean:

diff --git a/util/makefile.anbase b/util/makefile.anbase
@@ -2,7 +2,7 @@
 # Licensed under a 3-clause BSD style license - see LICENSE
 
 ANBASE_DIR := $(BASEDIR)/util
-ANBASE_LIB_FILE := $(ANBASE_DIR)/libanbase.a
+ANBASE_LIB_FILE ?= $(ANBASE_DIR)/libanbase.a
 
 ANBASE_CFLAGS :=
 ANBASE_INC := -I$(INCLUDE_BASE_DIR) -I$(INCLUDE_DIR)

diff --git a/util/makefile.anfiles b/util/makefile.anfiles
@@ -4,7 +4,7 @@
 ANFILES_DIR := $(BASEDIR)/util
 ANFILES_INC :=
 ANFILES_LIB := 
-ANFILES_LIB_FILE := $(ANFILES_DIR)/libanfiles.a
+ANFILES_LIB_FILE ?= $(ANFILES_DIR)/libanfiles.a
 ANFILES_SLIB := $(ANFILES_LIB_FILE)
 ANFILES_CFLAGS :=