fix aux file installation

diff --git a/Makefile.in b/Makefile.in
index 5efc5a6acfba7aed8b065295a3fb18566b095672..5a5bc63630acecb74d525bdd62e30f0b01af249b 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
 
 

diff --git a/configure.ac b/configure.ac
index 345a5a86fb8ae9ace336d8f02915656cc36e7eae..7fedb6b762c9a6b037cd0a065a9e1155c65a9f64 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # The default prefix should be changed from /usr/local. Set it, as in
 # the documentation, to /srv/mediagoblin.example.org/mediagoblin/
-AC_PREFIX_DEFAULT([/srv/mediagoblin.example.org/mediagoblin/])
+AC_PREFIX_DEFAULT([`pwd`])
 
 
 dnl###########################