From ca83471df2829f4aa12a8e809cc16a42b95567ab Mon Sep 17 00:00:00 2001
From: maxb <maxb@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Date: Wed, 7 Jul 2004 21:58:13 +0000
Subject: [PATCH] Fixup DESTDIR support, and have make provide feedback about
 which commands it is executing.

* Makefile: Remove default setting of DESTDIR.
    Call setup.py with --root=${DESTDIR}, not --prefix=${DESTDIR}, so that
    the install staging area gets the right directory structure.
    Do not suppress echo except to avoid uninformative screen clutter.


git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@1236 be7e6eca-30d4-0310-a8e5-ac0d63af7087
---
 Makefile | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 000fe930..0adab777 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,26 @@
 # Makefile for packaging and installing cvs2svn.
 
-DESTDIR=/usr/local
-
 all:
 	@echo "Use 'make install' to install, or 'make dist' to package",
 	@echo " or 'make check' to run tests."
 
 dist:
-	@./dist.sh
+	./dist.sh
 
 install:
-	@./setup.py install --prefix=${DESTDIR}
+	@case "${DESTDIR}" in \
+	"") \
+	echo ./setup.py install ; \
+	./setup.py install ; \
+	;; \
+	*) \
+	echo ./setup.py install --root=${DESTDIR} ; \
+	./setup.py install --root=${DESTDIR} ; \
+	;; \
+	esac
 
 check:
-	@./run-tests.py
+	./run-tests.py
 
 clean:
-	@rm -rf cvs2svn-*.tar.gz *.pyc build
+	rm -rf cvs2svn-*.tar.gz *.pyc build
-- 
2.11.4.GIT