[tor-commits] [flashproxy/master] Leave off --root if DESTDIR is not defined.

[dcf at torproject.org]

commit 67a9da95e65f55691d434763e910df617366278c
Author: David Fifield <david at bamsoftware.com>
Date:   Wed Dec 4 09:18:40 2013 -0800

    Leave off --root if DESTDIR is not defined.
    
    I got this error (note lack of leading slash on the installation
    directory):
    
    python setup-common.py install --root=
    running install
    Checking .pth file support in usr/local/lib/python2.7/dist-packages/
    /usr/bin/python -E -c pass
    TEST FAILED: usr/local/lib/python2.7/dist-packages/ does NOT support .pth files
    error: bad install directory or PYTHONPATH
---
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 143b098..bfe36be 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ all:
 
 install:
 	$(MAKE_CLIENT) DESTDIR=$(DESTDIR) REBUILD_MAN=$(REBUILD_MAN) install
-	$(PYTHON) setup-common.py install --root=$(DESTDIR)
+	$(PYTHON) setup-common.py install $(if $(DESTDIR),--root=$(DESTDIR))
 
 DISTDIR = dist/$(DISTNAME)
 $(DISTDIR): Makefile.client setup-common.py $(THISFILE)