This was a quick update to clean up some of my templates and fix the formatting

[mediagoblin.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5efc5a6acfba7aed8b065295a3fb18566b095672..a79d6cbcc3807ed6b3c0c8ffb7df321d5623dcd3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,6 +40,7 @@ includedir = @includedir@
 infodir = @infodir@
 prefix = @prefix@
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 pythondir = @pythondir@
@@ -71,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
@@ -89,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
 
 
@@ -119,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