[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] Fix make PREFIX=foo to work with non-windows stuff again
Update of /home/minion/cvsroot/src/minion
In directory moria.mit.edu:/tmp/cvs-serv27780
Modified Files:
Makefile
Log Message:
Fix make PREFIX=foo to work with non-windows stuff again
Index: Makefile
===================================================================
RCS file: /home/minion/cvsroot/src/minion/Makefile,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- Makefile 6 Mar 2004 05:22:03 -0000 1.65
+++ Makefile 7 Mar 2004 21:25:15 -0000 1.66
@@ -92,15 +92,17 @@
install: do_build
@$(FINDPYTHON); \
ARGS="install --compile --optimize=1 --force"; \
+ PREFIXARG=""; \
+ ROOTARG=""; \
if [ 'x' != "x$(PREFIX)" ] ; then \
- PREFIX=$(PREFIX); export PREFIX; \
- ARGS=$$ARGS --prefix="$(PREFIX)"; \
+ PREFIX="$(PREFIX)"; export PREFIX; \
+ PREFIXARG=--prefix="$(PREFIX)"; \
fi; \
if [ 'x' != "x$(DESTDIR)" ] ; then \
- ARGS=$$ARGS --root="$(DESTDIR)"; \
+ ROOTARG=--root="$(ROOTARG)"; \
fi; \
- echo $$PYTHON -tt setup.py $$ARGS; \
- $$PYTHON -tt setup.py $$ARGS
+ echo $$PYTHON -tt setup.py $$ARGS $$PREFIXARG $$ROOTARG; \
+ $$PYTHON -tt setup.py $$ARGS $$PREFIXARG $$ROOTARG
update:
@$(FINDPYTHON); \