[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Accept DESTDIR variable



Update of /home/minion/cvsroot/src/minion
In directory moria.mit.edu:/tmp/cvs-serv32281

Modified Files:
	Makefile 
Log Message:
Accept DESTDIR variable

Index: Makefile
===================================================================
RCS file: /home/minion/cvsroot/src/minion/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Makefile	24 Nov 2003 19:59:03 -0000	1.55
+++ Makefile	25 Nov 2003 03:41:57 -0000	1.56
@@ -90,19 +90,17 @@
 
 
 install: do_build
-	@$(FINDPYTHON); \
-	if [ 'x' = "x$(PREFIX)" ] ; then                                     \
-	  echo $$PYTHON -tt setup.py install --compile --optimize=1 --force; \
-	  $$PYTHON -tt setup.py install --compile --optimize=1 --force;      \
-	else                                                                 \
-	  PREFIX=$(PREFIX);                                                  \
-	  export PREFIX;                                                     \
-	  echo $$PYTHON -tt setup.py install --prefix=$(PREFIX) --compile --optimize=1 --force; \
-	  $$PYTHON -tt setup.py install --prefix=$(PREFIX) --compile --optimize=1 --force;\
-	fi
-
-#	  echo "MIXMINION SAYS: Please ignore the warning about sys.path:"
-#	  echo "  The installed script will adjust sys.path automatically."
+	@$(FINDPYTHON);                                                      \
+	ARGS="install --compile --optimize=1 --force";                       \
+	if [ 'x' != "x$(PREFIX)" ] ; then                                    \
+	  PREFIX=$(PREFIX); export PREFIX;                                   \
+	  ARGS="$$ARGS --prefix=$(PREFIX)";                                  \
+	fi;                                                                  \
+	if [ 'x' != "x$(DESTDIR)" ] ; then                                   \
+	  ARGS="$$ARGS --root=$(DESTDIR)";                                   \
+        fi;                                                                  \
+	echo $$PYTHON -tt setup.py $$ARGS;                                   \
+	$$PYTHON -tt setup.py $$ARGS
 
 update:
 	@$(FINDPYTHON);                                                      \