heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix virtualenv python interpreter and fix update target

Browse Source
This commit is contained in:
Brandon Invergo 2013-05-19 15:28:04 +02:00
parent f16f93be3f
commit 297a262c37
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile.in
View File

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