clean more on distclean

[mediagoblin.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a3f40f51a804c1ca932370175a00ee4abfbacc2a..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,10 +72,10 @@ ifneq ($(VIRTUALENV),no)
 else
        $(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
 endif
-       if [[ $(DESTDIR)$(prefix) != $(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
+       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
@@ -88,10 +90,10 @@ ifneq ($(VIRTUALENV),no)
 else
        $(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
 endif
-       if [[ $(DESTDIR)$(prefix) != $(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
+       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
 
 
@@ -118,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
@@ -139,8 +142,8 @@ installdirs:
 
 # 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)