From 9ea07a1d87689df106d4fe1b0e76237aeea32630 Mon Sep 17 00:00:00 2001
From: Mathieu Clabaut <mathieu.clabaut@gmail.com>
Date: Fri, 21 Dec 2007 15:47:30 -0600
Subject: Makefile cleaning + use of DESTDIR

---
 Makefile | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 17ac854..488b5cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,19 @@
+DESTDIR        ?=
+prefix         	= /usr
+bindir       	= ${prefix}/bin
+etcdir       	= /etc
+mandir          = ${prefix}/man1
+
+INSTALL         = install 
+INSTALL_EXE     = ${INSTALL}
+INSTALL_DATA    = ${INSTALL} -m 0644 -D
+
 install:
-	mkdir -p $(PREFIX)/etc/etckeeper/
-	cp -a *.d $(PREFIX)/etc/etckeeper/
-	cp etckeeper.conf $(PREFIX)/etc/etckeeper/
-	install -D etckeeper $(PREFIX)/usr/bin/etckeeper
-	install -m 0644 -D apt.conf $(PREFIX)/etc/apt/apt.conf.d/05etckeeper
-	install -m 0644 -D etckeeper.1 $(PREFIX)/usr/share/man/man1/etckeeper.1
-	install -m 0644 -D bash_completion $(PREFIX)/etc/bash_completion.d/etckeeper
\ No newline at end of file
+	mkdir -p $(DESTDIR)$(etcdir)/etckeeper/
+	$(INSTALL_DATA) etckeeper.conf $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
+	cp -a *.d $(DESTDIR)$(etcdir)/etckeeper/
+	chown root.root -R $(DESTDIR)$(etcdir)/etckeeper/
+	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper
+	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
+	$(INSTALL_DATA) etckeeper.1 $(DESTDIR)$(mandir)/man1/etckeeper.1
+	$(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
-- 
cgit v1.2.3


From 5036bb6911a3a6f7d0b0350b2d80b6e236bd737f Mon Sep 17 00:00:00 2001
From: Mathieu Clabaut <mathieu.clabaut@gmail.com>
Date: Fri, 21 Dec 2007 15:47:30 -0600
Subject: Makefile : hg subdirs installation

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 488b5cc..16f942f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,8 @@ INSTALL_DATA    = ${INSTALL} -m 0644 -D
 install:
 	mkdir -p $(DESTDIR)$(etcdir)/etckeeper/
 	$(INSTALL_DATA) etckeeper.conf $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
-	cp -a *.d $(DESTDIR)$(etcdir)/etckeeper/
+	cp -a hg $(DESTDIR)$(etcdir)/etckeeper/
+	cp -a git $(DESTDIR)$(etcdir)/etckeeper/
 	chown root.root -R $(DESTDIR)$(etcdir)/etckeeper/
 	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper
 	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
-- 
cgit v1.2.3


From f8a08579d9ff274a17da0bbb29f8575d10425585 Mon Sep 17 00:00:00 2001
From: Mathieu Clabaut <mathieu.clabaut@gmail.com>
Date: Fri, 21 Dec 2007 15:47:30 -0600
Subject: Makefile correction - dir creation, and man dest

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 16f942f..daf2a60 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ DESTDIR        ?=
 prefix         	= /usr
 bindir       	= ${prefix}/bin
 etcdir       	= /etc
-mandir          = ${prefix}/man1
+mandir          = ${prefix}/man
 
 INSTALL         = install 
-INSTALL_EXE     = ${INSTALL}
+INSTALL_EXE     = ${INSTALL} -D
 INSTALL_DATA    = ${INSTALL} -m 0644 -D
 
 install:
-- 
cgit v1.2.3