various fixes and additions
diff --git a/examples/mediagoblin/Makefile.in b/examples/mediagoblin/Makefile.in
--- a/examples/mediagoblin/Makefile.in
+++ b/examples/mediagoblin/Makefile.in
@@ -12,8 +12,9 @@ VIRTUALENV = @VIRTUALENV@
SPHINXBUILD = @SPHINXBUILD@
SHELL = @SHELL@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
@@ -32,15 +33,15 @@ all: install
install:
$(NORMAL_INSTALL)
-ifneq ($VIRTUALENV, no)
- $(VIRTUALENV) $(VIRTUALENV_FLAGS) $(DESTDIR)$(prefix) || virtualenv $(DESTDIR)$(prefix)
+ifneq ($(VIRTUALENV),no)
+ $(VIRTUALENV) $(VIRTUALENV_FLAGS) $(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)
+ $(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
endif
- $(INSTALL_PROGRAM) $(srcdir)/lazyserver.sh $(DESTDIR)$(datadir)
- $(INSTALL_PROGRAM) $(srcdir)/lazycelery.sh $(DESTDIR)$(datadir)
- $(INSTALL_PROGRAM) $(srcdir)/lazystarter.sh $(DESTDIR)$(datadir)
+ $(INSTALL_SCRIPT) $(srcdir)/lazyserver.sh $(DESTDIR)$(datadir)
+ $(INSTALL_SCRIPT) $(srcdir)/lazycelery.sh $(DESTDIR)$(datadir)
+ $(INSTALL_SCRIPT) $(srcdir)/lazystarter.sh $(DESTDIR)$(datadir)
$(INSTALL_DATA) $(srcdir)/mediagoblin.ini $(DESTDIR)$(datadir)
$(INSTALL_DATA) $(srcdir)/paste.ini $(DESTDIR)$(datadir)
@@ -71,7 +72,7 @@ distclean: $(wildcard $(srcdir)/docs/sou
info: docs/build/texinfo/gnumediagoblin.info
docs/build/texinfo/gnumediagoblin.info: $(wildcard docs/source/*)
-ifneq ($SPHINX_BUILD, no)
+ifneq ($(SPHINX_BUILD),no)
$(MAKE) -C docs info SPHINXBUILD=$(SPHINXBUILD)
endif
@@ -82,7 +83,7 @@ install-html: html
html: docs/build/html/index.html
docs/build/html/index.html: $(wildcard $(srcdir)/docs/source/*)
-ifneq ($SPHINX_BUILD, no)
+ifneq ($(SPHINX_BUILD),no)
$(MAKE) -C docs html SPHINXBUILD=$(SPHINXBUILD)
endif
@@ -93,7 +94,7 @@ install-pdf: pdf
pdf: docs/build/latex/GNUMediaGoblin.pdf
docs/build/latex/GNUMediaGoblin.pdf: $(wildcard $(srcdir)/docs/source/*)
-ifneq ($SPHINX_BUILD, no)
+ifneq ($(SPHINX_BUILD),no)
$(MAKE) -C docs latexpdf SPHINXBUILD=$(SPHINXBUILD)
endif
diff --git a/examples/mediagoblin/configure.ac b/examples/mediagoblin/configure.ac
--- a/examples/mediagoblin/configure.ac
+++ b/examples/mediagoblin/configure.ac
@@ -56,7 +56,6 @@ AS_IF([test "x$SPHINXBUILD" = xno],
AC_MSG_WARN(sphinx-build is required to build documentation))
-AC_DEFUN([VIRTUALENV], [no])
AC_ARG_WITH([virtualenv],
[AS_HELP_STRING([--with-virtualenv], [install to a Python virtualenv])],
[],
@@ -65,9 +64,11 @@ AS_IF([test "x$with_virtualenv" != xno],
AC_CHECK_PROGS([VIRTUALENV], [virtualenv virtualenv2], [no])
AS_IF([test "x$VIRTUALENV" = xno],
[AC_MSG_FAILURE(
- [--with-virtualenv given but virtualenv could not be found])]))
+ [--with-virtualenv given but virtualenv could not be found])]),
+ AC_SUBST([VIRTUALENV], [no]))
AC_ARG_VAR([VIRTUALENV_FLAGS], [flags to pass to the virtualenv command])
-
+
+AC_PROG_INSTALL
PC_PYTHON_CHECK_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
@@ -75,7 +76,7 @@ PC_PYTHON_SITE_PACKAGE_DIR
PC_PYTHON_EXEC_PACKAGE_DIR
PC_PYTHON_CHECK_MODULE([lxml],,[AC_MSG_ERROR(could not find Python lxml module)])
-PC_PYTHON_CHECK_MODULE([Image],,[AC_MSG_ERROR(could not find Python Imaging Library (PIL)])
+PC_PYTHON_CHECK_MODULE([Image],,[AC_MSG_ERROR(could not find Python Imaging Library)])