From 5ce2d8e5e95f392886873db0cbe7a0ac3d331273 Mon Sep 17 00:00:00 2001
From: Jason Bacon <jwbacon@tds.net>
Date: Wed, 18 Nov 2015 15:02:10 -0600
Subject: [PATCH 1/5] Add install target

---
 Makefile | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b1ddeaa..13c1544 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,16 @@
 
-CC ?=	gcc
-CXX ?=	g++
+CC ?=		cc
+CXX ?=		c++
+DESTDIR ?=	stage
+PREFIX ?=	/usr/local
+MKDIR ?=	mkdir
+INSTALL ?=	install -c
+STRIP ?=	strip
+AR ?=		ar
 
-all: multichoose multipermute
+BINS =	multichoose cmultichoose multipermute
+
+all: ${BINS}
 
 #multichoose_recursive: multichoose_recursive.cpp
 #	${CXX} multichoose_recursive.cpp -o multichoose_recursive
@@ -16,6 +24,14 @@ multipermute: multipermute.cpp multipermute.h
 cmultichoose: multichoose.c
 	${CC} multichoose.c -o cmultichoose
 
+install: all
+	${MKDIR} -p ${DESTDIR}${PREFIX}/bin
+	${MKDIR} -p ${DESTDIR}${PREFIX}/include/multichoose
+	${INSTALL} ${BINS} ${DESTDIR}${PREFIX}/bin
+	${INSTALL} *.h ${DESTDIR}${PREFIX}/include/multichoose
+
+install-strip: install
+	${STRIP} ${DESTDIR}${PREFIX}/bin/${BIN}
+
 clean:
-	rm cmultichoose
-	rm multichoose
+	rm -rf ${BINS} ${DESTDIR}

From 67e7a16ff38df7d93fe966dbdc6a8054001c1c21 Mon Sep 17 00:00:00 2001
From: Jason Bacon <jwbacon@tds.net>
Date: Sat, 21 Nov 2015 10:35:25 -0600
Subject: [PATCH 2/5] Add block comment on make variables

---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 13c1544..2346973 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,12 @@
 
+# Use ?= to allow overriding from the env or command-line, e.g.
+#
+#       make CXXFLAGS="-O3 -fPIC" install
+#
+# Package managers will override many of these variables automatically, so
+# this is aimed at making it easy to create packages (Debian packages,
+# FreeBSD ports, MacPorts, pkgsrc, etc.)
+
 CC ?=		cc
 CXX ?=		c++
 DESTDIR ?=	stage

From ea516b865d57a8597fc0f8e9f077abd35aeddf05 Mon Sep 17 00:00:00 2001
From: Jason Bacon <jwbacon@tds.net>
Date: Sun, 22 Nov 2015 10:15:11 -0600
Subject: [PATCH 3/5] Fix install-strip target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2346973..b93e715 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ install: all
 	${INSTALL} *.h ${DESTDIR}${PREFIX}/include/multichoose
 
 install-strip: install
-	${STRIP} ${DESTDIR}${PREFIX}/bin/${BIN}
+	${STRIP} ${DESTDIR}${PREFIX}/bin/${BINS}
 
 clean:
 	rm -rf ${BINS} ${DESTDIR}

From d60d639af93f8720e019d824bb2405eb4523fb16 Mon Sep 17 00:00:00 2001
From: Jason Bacon <jwbacon@tds.net>
Date: Sun, 22 Nov 2015 10:16:04 -0600
Subject: [PATCH 4/5] Fix install-strip target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b93e715..27fb76c 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ install: all
 	${INSTALL} *.h ${DESTDIR}${PREFIX}/include/multichoose
 
 install-strip: install
-	${STRIP} ${DESTDIR}${PREFIX}/bin/${BINS}
+	${STRIP} ${DESTDIR}${PREFIX}/bin/*
 
 clean:
 	rm -rf ${BINS} ${DESTDIR}

From a35c94abd1b312fdcc10455f90b6e527c271bb35 Mon Sep 17 00:00:00 2001
From: Jason Bacon <jwbacon@tds.net>
Date: Sun, 22 Nov 2015 10:29:25 -0600
Subject: [PATCH 5/5] Fix install-strip target

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 27fb76c..4a34304 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,11 @@ install: all
 	${MKDIR} -p ${DESTDIR}${PREFIX}/bin
 	${MKDIR} -p ${DESTDIR}${PREFIX}/include/multichoose
 	${INSTALL} ${BINS} ${DESTDIR}${PREFIX}/bin
+	${INSTALL} *.py ${DESTDIR}${PREFIX}/bin
 	${INSTALL} *.h ${DESTDIR}${PREFIX}/include/multichoose
 
 install-strip: install
-	${STRIP} ${DESTDIR}${PREFIX}/bin/*
+	${STRIP} ${DESTDIR}${PREFIX}/bin/*e
 
 clean:
 	rm -rf ${BINS} ${DESTDIR}