--- Makefile.orig	2016-04-07 18:26:26 UTC
+++ Makefile
@@ -32,8 +32,9 @@ PREFIX = /usr/local
 
 VPATH = $(SRC)include:$(SRC)src:$(SRC)examples
 CC = $(CXX)
-CPPFLAGS = -Wall -I$(SRC)include -std=$(STD) -pthread \
-	   $(TEST_FLAGS) $(OPT) -fPIC -MMD
+CXXFLAGS = -Wall -std=$(STD) -pthread \
+	   $(TEST_FLAGS) $(OPT) -fPIC -MMD $(EXTRA_CXXFLAGS)
+CPPFLAGS = -I$(SRC)include $(EXTRA_CPPFLAGS)
 ARFLAGS = rcs
 LDFLAGS = -pthread
 LDLIBS = $(TEST_LIBS)
@@ -62,11 +63,12 @@ all: $(TESTS) $(TOOLS) $(EXAMPLES)
 $(TESTS) $(TOOLS) $(EXAMPLES): $(CCTZ_LIB)
 
 $(CCTZ_LIB): $(CCTZ_OBJS)
+	true $(STRIP) $(CCTZ_OBJS)
 	$(AR) $(ARFLAGS) $@ $(CCTZ_OBJS)
 
 install: $(CCTZ_HDRS) $(CCTZ_LIB)
-	sudo cp -p $(CCTZ_HDRS) $(PREFIX)/include
-	sudo cp -p $(CCTZ_LIB) $(PREFIX)/lib
+	cd include && cp -p $(CCTZ_HDRS) $(DESTDIR)$(PREFIX)/include
+	cp -p $(CCTZ_LIB) $(DESTDIR)$(PREFIX)/lib
 
 clean:
 	@$(RM) -r $(EXAMPLES:=.dSYM) $(EXAMPLES:=.o) $(EXAMPLES:=.d) $(EXAMPLES)
