diff options
| author | Brandon Invergo <brandon@invergo.net> | 2013-05-19 23:42:04 +0200 |
|---|---|---|
| committer | Brandon Invergo <brandon@invergo.net> | 2013-05-19 23:42:04 +0200 |
| commit | e56b493a9e3846672fb1b0927ec354b1a8d9a3a2 (patch) | |
| tree | f20e4ff337abce6a876a68dc923ec01011705b52 | |
| parent | ceb768ae6ef76e03f3c147caaf654a26ab3c5137 (diff) | |
| download | mediagoblin-e56b493a9e3846672fb1b0927ec354b1a8d9a3a2.tar.lz mediagoblin-e56b493a9e3846672fb1b0927ec354b1a8d9a3a2.tar.xz mediagoblin-e56b493a9e3846672fb1b0927ec354b1a8d9a3a2.zip | |
fix aux file installation
| -rw-r--r-- | Makefile.in | 17 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 5efc5a6a..5a5bc636 100644 --- 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 345a5a86..7fedb6b7 100644 --- 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########################### |