From: Brandon Invergo <brandon@invergo.net>
Date: Sun, 19 May 2013 13:28:04 +0000 (+0200)
Subject: fix virtualenv python interpreter and fix update target
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=297a262c37a27e4cb08e7393ed7dbc6dca6aaa07;p=mediagoblin.git

fix virtualenv python interpreter and fix update target
---

diff --git a/Makefile.in b/Makefile.in
index af3a6ae3..bfcc257f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,14 +55,18 @@ all: install
 install-pdf pdf install-dvi dvi install-ps ps clean dist check \
 installdirs postgresql update
 
-# Since installing to a virtualenv is all the rage these days, support it here. If the VIRTUALENV
-# variable is set to anything other than "no", set up a new virtualenv and install there, otherwise
-# install as usual from setup.py
+# Since installing to a virtualenv is all the rage these days, support
+# it here. If the VIRTUALENV variable is set to anything other than
+# "no", set up a new virtualenv and install there, otherwise install
+# as usual from setup.py
 install: installdirs
 	$(NORMAL_INSTALL)
 ifneq ($(VIRTUALENV),no)
-	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --system-site-packages $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix)
-	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --python=$(PYTHON) \
+		--system-site-packages $(DESTDIR)$(prefix) || \
+		$(VIRTUALENV) $(DESTDIR)$(prefix)
+	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py install \
+		--prefix=$(DESTDIR)$(prefix)
 else
 	$(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
 endif
@@ -72,8 +76,11 @@ endif
 develop: installdirs
 	$(NORMAL_INSTALL)
 ifneq ($(VIRTUALENV),no)
-	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --system-site-packages $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix)
-	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
+	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --python=$(PYTHON) \
+		--system-site-packages $(DESTDIR)$(prefix) || \
+		$(VIRTUALENV) $(DESTDIR)$(prefix)
+	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py develop \
+		--prefix=$(DESTDIR)$(prefix)
 else
 	$(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
 endif
@@ -85,9 +92,9 @@ endif
 # should remove a basic package installed via setup.py, but please double- and 
 # triple-check it so that you don't remove something you shouldn't!
 # Be sure to remove any extra files you install, such as binaries or documentation!
-uninstall: 
-	rm -rvf $(pkgpythondir)
-	rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
+# uninstall: 
+# 	rm -rvf $(pkgpythondir)
+# 	rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
 
 
 # Just use the usual setup.py clean command
@@ -126,9 +133,9 @@ postgresql:
 
 update:
 ifneq ($(VIRTUALENV),no)
-	$(prefix)/bin/python $(prefix)/setup.py develop --prefix=$(prefix) --upgrade
+	$(prefix)/bin/python $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade
 else
-	$(PYTHON) $(prefix)/setup.py develop --prefix=$(DESTDIR)$(prefix) --upgrade
+	$(PYTHON) $(srcdir)/setup.py develop --prefix=$(prefix) --upgrade
 endif	
 	$(prefix)/bin/gmg dbupdate