set some variables conditionally in Makefiles

rhash · Nov 16, 2015 · b19157f · b19157f
1 parent e6251fb
commit b19157f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Tue Nov 17 2015 Alexey Dokuchaev, Kurt Jaeger
+	* Compilation fixes for FreeBSD
+
 Sat Aug  9 2014 Aleksey
 	* return non zero exit code if a file was not found
 

diff --git a/Makefile b/Makefile
@@ -3,8 +3,8 @@
 # compile for pentiumpro: make CFLAGS="-O2 -DNDEBUG -march=i586 -mcpu=pentiumpro -fomit-frame-pointer"
 # create rpm with statically linked program: make rpm ADDLDFLAGS="-static -s -Wl,--gc-sections"
 VERSION = 1.3.3
-PREFIX  = /usr/local
-CC      = gcc
+PREFIX  ?= /usr/local
+CC      ?= gcc
 # using OPTFLAGS/OPTLDFLAGS for compatibilty with old scripts using this makefile
 OPTFLAGS = -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
 OPTLDFLAGS =

diff --git a/librhash/Makefile b/librhash/Makefile
@@ -1,6 +1,6 @@
 # Makefile for LibRHash
-CC      = gcc
-AR      = ar
+CC      ?= gcc
+AR      ?= ar
 #NOTE: NDEBUG turns off asserts
 OPTFLAGS   = -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
 OPTLDFLAGS =
@@ -24,7 +24,7 @@ LEGACY_LIB_HEADERS = rhash_timing.h
 SO_HEADERS = $(LIB_HEADERS) $(LEGACY_LIB_HEADERS)
 # installation directories and names
 DESTDIR =
-PREFIX  = /usr/local
+PREFIX  ?= /usr/local
 INCDIR  = $(PREFIX)/include
 LIBDIR  = $(PREFIX)/lib
 LIBRARY = librhash.a