This should be my final code update before I am ready for review! Basically, in

[mediagoblin.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index bfcc257f7db7b872f6560ecbc3b10cf06584c030..a79d6cbcc3807ed6b3c0c8ffb7df321d5623dcd3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -25,6 +25,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PYTHON = @PYTHON@
 VIRTUALENV = @VIRTUALENV@
 SPHINXBUILD = @SPHINXBUILD@
+POSTGRES = @POSTGRES@
 SHELL = @SHELL@
 MKDIR_P = @MKDIR_P@
 INSTALL = @INSTALL@
@@ -39,6 +40,7 @@ includedir = @includedir@
 infodir = @infodir@
 prefix = @prefix@
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 pythondir = @pythondir@
@@ -70,7 +72,11 @@ ifneq ($(VIRTUALENV),no)
 else
        $(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
 endif
-       $(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile
+       if [[ $(DESTDIR)$(prefix) != $(abs_srcdir) ]]; then \
+               $(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile; \
+               $(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh; \
+               $(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh; \
+       fi
 
 # The same as "install", except use the "develop" setup.py target
 develop: installdirs
@@ -84,7 +90,11 @@ ifneq ($(VIRTUALENV),no)
 else
        $(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
 endif
-       $(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile
+       if [ "$(DESTDIR)$(prefix)" != "$(abs_srcdir)" ]; then \
+               $(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile; \
+               $(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh; \
+               $(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh; \
+       fi
 
 
 # setup.py doesn't (yet) support an uninstall command, so until it does, you 
@@ -93,9 +103,12 @@ endif
 # 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
-
+#      case $(prefix) in
+#              /usr|/usr/local )
+#                      exit 1 ;;
+#              /www/*|/srv/* )
+#                      rm -rvf $(prefix) ;;
+#      esac
 
 # Just use the usual setup.py clean command
 clean:
@@ -107,6 +120,7 @@ distclean:
        rm -v $(srcdir)/config.log
        rm -v $(srcdir)/config.status
        rm -rvf $(srcdir)/autom4te.cache
+       rm -v $(srcdir)/aclocal.m4
        rm -v $(srcdir)/Makefile
 
 # You can either use the setup.py sdist command or you can roll your own here
@@ -124,12 +138,12 @@ check:
 # setup.py might complain if a directory doesn't exist so just in case, make the directory
 # here
 installdirs:
-       $(MKDIR_P) $(DESTDIR)$(pkgpythondir)
+       $(MKDIR_P) $(DESTDIR)$(prefix)
 
 # Set up PostgreSQL
 postgresql:
-       sudo -u postgres createuser mediagoblin
-       sudo -u postgres createdb -E UNICODE -O mediagoblin mediagoblin
+       sudo -u $(POSTGRES) createuser mediagoblin
+       sudo -u $(POSTGRES) createdb -E UNICODE -O mediagoblin mediagoblin
 
 update:
 ifneq ($(VIRTUALENV),no)