From c6161f527acc81917cfd116028432abc6aa6e0b6 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 9 Oct 2013 23:24:33 -0700
Subject: [PATCH] Allow prefix on make command line

---
 Makedefs |  1 +
 Makefile | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 Makedefs

diff --git a/Makedefs b/Makedefs
new file mode 100644
index 0000000..785d2c3
--- /dev/null
+++ b/Makedefs
@@ -0,0 +1 @@
+prefix=/usr/lib/arm-none-eabi
diff --git a/Makefile b/Makefile
index 107dced..ad3fb38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 # $Id$
 
-DESTDIR=
+ifndef prefix
 prefix=/opt/cortex
+endif
+
 libdir=$(prefix)/lib
 bindir=$(prefix)/bin
 includedir=$(prefix)/include
@@ -52,20 +54,22 @@ CFLAGS := -fno-builtin -Os -g -std=c99 -I./$(BUILD)/internals -I./testing $(WARN
 
 .PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
 
-PDCLIB=pdclib-$(CPU).a
+PDCLIBNAME=libpdclib
+PDCLIB=$(PDCLIBNAME)-$(CPU).a
 
 all:
-	+for i in $(CPUS); do make CPU=$$i links pdclib-$$i.a; done
+	+for i in $(CPUS); do make CPU=$$i links $(PDCLIBNAME)-$$i.a; done
 
 install: install-hdr
-	+for i in $(CPUS); do make CPU=$$i install-lib-$$i; done
+	@echo '######' install
+	+for i in $(CPUS); do make CPU=$$i prefix=$(prefix) install-lib-$$i; done
 
 install-hdr:
-	+make CPU=$(FIRSTCPU) install-hdr-$(FIRSTCPU)
+	@echo '######' install-hdr
+	+make CPU=$(FIRSTCPU) prefix=$(prefix) install-hdr-$(FIRSTCPU)
 
 clean:
 	+for i in $(CPUS); do make CPU=$$i clean-$$i; rm -rf build-$$i; done
-	rm -f pdclib.a
 
 check: all testdrivers regtestdrivers
 	@echo
@@ -87,13 +91,16 @@ $(PDCLIB): $(BUILD) $(OBJFILES)
 	@echo
 
 install-$(CPU): install-$(CPU)-lib install-hdr
+	@echo '######' install-$(CPU)
 
-install-lib-$(CPU): $(BUILD) $(PDCLIB)
+install-lib-$(CPU): $(PDCLIB)
+	@echo '######' install-lib-$(CPU)
 	install -D -c $(PDCLIB) $(DESTDIR)$(libdir)/$(PDCLIB)
 
 install-hdr-$(CPU): $(BUILD) $(BUILDHDRFILES)
+	@echo '######' install-hdr-$(CPU)
 	for file in $(BUILDHDRFILES); do \
-		install -D -c $$file $(DESTDIR)$(includedir)/.; \
+		install -m 0444 -D -c $$file $(DESTDIR)$(includedir)/.; \
 	done
 
 test: functions/$(FILE)
@@ -163,8 +170,8 @@ help:
 	@echo "(Usage: USERFLAGS=\"flags\" make [...])."
 
 %.o: %.c Makefile
-	echo " CC	$(patsubst functions/%,%,$@)"
-	$(CC) $(CFLAGS) -MMD -MP -I./$(BUILD)/includes -c $< -o $@
+	@echo " CC	$(patsubst functions/%,%,$@)"
+	@$(CC) $(CFLAGS) -MMD -MP -I./$(BUILD)/includes -c $< -o $@
 
 %_t: %.c Makefile $(PDCLIB)
 	@echo " CC	$(patsubst functions/%,%,$@)"
-- 
2.30.2