finish mediagoblin files
diff --git a/examples/mediagoblin/Makefile.in b/examples/mediagoblin/Makefile.in --- a/examples/mediagoblin/Makefile.in +++ b/examples/mediagoblin/Makefile.in @@ -11,6 +11,7 @@ PYTHON = @PYTHON@ VIRTUALENV = @VIRTUALENV@ SPHINXBUILD = @SPHINXBUILD@ SHELL = @SHELL@ +MKDIR_P = @MKDIR_P@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -23,15 +24,20 @@ includedir = @includedir@ infodir = @infodir@ prefix = @prefix@ srcdir = @srcdir@ +datadir = @datadir@ +pythondir = @pythondir@ +pyexecdir = @pyexecdir@ +pkgdatadir = $(datadir)/@PACKAGE_NAME@ +pkgincludedir = $(includedir)/@PACKAGE_NAME@ pkgpythondir = @pkgpythondir@ pkgpyexecdir = @pkgpyexecdir@ - +PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir) all: install -.PHONY: all install uninstall distclean info install-html html install-pdf pdf install-dvi dvi install-ps ps clean dist check +.PHONY: all install uninstall distclean info install-html html install-pdf pdf install-dvi dvi install-ps ps clean dist check installdirs -install: +install: installdirs $(NORMAL_INSTALL) ifneq ($(VIRTUALENV),no) $(VIRTUALENV) $(VIRTUALENV_FLAGS) $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix) @@ -39,15 +45,15 @@ ifneq ($(VIRTUALENV),no) else $(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix) endif - $(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) + $(INSTALL_SCRIPT) $(srcdir)/lazyserver.sh $(DESTDIR)$(pkgdatadir) + $(INSTALL_SCRIPT) $(srcdir)/lazycelery.sh $(DESTDIR)$(pkgdatadir) + $(INSTALL_SCRIPT) $(srcdir)/lazystarter.sh $(DESTDIR)$(pkgdatadir) + $(INSTALL_DATA) $(srcdir)/mediagoblin.ini $(DESTDIR)$(pkgdatadir) + $(INSTALL_DATA) $(srcdir)/paste.ini $(DESTDIR)$(pkgdatadir) uninstall: $(wildcard $(srcdir)/docs/source/*) - rm -rf $(DESTDIR)$(datadir) + rm -rf $(DESTDIR)$(pkgdatadir) rm -rf $(DESTDIR)$(htmldir) rm -rf $(DESTDIR)$(pdfdir) @@ -77,7 +83,7 @@ ifneq ($(SPHINX_BUILD),no) endif -install-html: html +install-html: html installdirs $(INSTALL_DATA) docs/build/html/* $(DESTDIR)$(htmldir) html: docs/build/html/index.html @@ -88,7 +94,7 @@ ifneq ($(SPHINX_BUILD),no) endif -install-pdf: pdf +install-pdf: pdf installdirs $(INSTALL_DATA) docs/build/latex/GNUMediaGoblin.pdf $(DESTDIR)$(pdfdir) pdf: docs/build/latex/GNUMediaGoblin.pdf @@ -113,3 +119,10 @@ dist: check: $(PYTHON) setup.py check + +installdirs: + $(MKDIR_P) \ + $(DESTDIR)$(pkgpythondir) \ + $(DESTDIR)$(pkgdatadir) \ + $(DESTDIR)$(htmldir) \ + $(DESTDIR)$(pdfdir) diff --git a/examples/mediagoblin/configure.ac b/examples/mediagoblin/configure.ac --- a/examples/mediagoblin/configure.ac +++ b/examples/mediagoblin/configure.ac @@ -31,11 +31,11 @@ dnl Autoconf and Automake initialization dnl####################################### # Initialize Autoconf. -AC_INIT(MediaGoblin, 0.3.1) +AC_INIT(mediagoblin, 0.3.1) # Load macros from the m4/ directory AC_CONFIG_MACRO_DIR([m4]) - +AM_INIT_AUTOMAKE # Here we check if we are using Python 3 PC_PYTHON_VERIFY_VERSION([$PYTHON], 3.0, @@ -68,6 +68,7 @@ AS_IF([test "x$with_virtualenv" != xno], AC_SUBST([VIRTUALENV], [no])) AC_ARG_VAR([VIRTUALENV_FLAGS], [flags to pass to the virtualenv command]) +AC_PROG_MKDIR_P AC_PROG_INSTALL PC_PYTHON_CHECK_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])