heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix aux file installation

Browse Source
This commit is contained in:
Brandon Invergo 2013-05-19 23:42:04 +02:00
parent ceb768ae6e
commit e56b493a9e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.in
View File

@ -40,6 +40,7 @@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
prefix = @prefix@ prefix = @prefix@
srcdir = @srcdir@ srcdir = @srcdir@
abs_srcdir = @abs_srcdir@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
pythondir = @pythondir@ pythondir = @pythondir@
@ -71,10 +72,10 @@ ifneq ($(VIRTUALENV),no)
else else
$(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix) $(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
endif endif
if [[ $(DESTDIR)$(prefix) != $(srcdir) ]]; then if [[ $(DESTDIR)$(prefix) != $(abs_srcdir) ]]; then \
$(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile $(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile; \
$(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh $(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh; \
$(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh $(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh; \
fi fi
# The same as "install", except use the "develop" setup.py target # The same as "install", except use the "develop" setup.py target
@ -89,10 +90,10 @@ ifneq ($(VIRTUALENV),no)
else else
$(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix) $(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
endif endif
if [[ $(DESTDIR)$(prefix) != $(srcdir) ]]; then if [ "$(DESTDIR)$(prefix)" != "$(abs_srcdir)" ]; then \
$(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile $(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile; \
$(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh $(INSTALL_DATA) $(srcdir)/lazycelery.sh $(DESTDIR)$(prefix)/lazycelery.sh; \
$(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh $(INSTALL_DATA) $(srcdir)/lazyserver.sh $(DESTDIR)$(prefix)/lazyserver.sh; \
fi fi

2
configure.ac
View File

@ -57,7 +57,7 @@ AC_CONFIG_MACRO_DIR([m4])
# The default prefix should be changed from /usr/local. Set it, as in # The default prefix should be changed from /usr/local. Set it, as in
# the documentation, to /srv/mediagoblin.example.org/mediagoblin/ # the documentation, to /srv/mediagoblin.example.org/mediagoblin/
AC_PREFIX_DEFAULT([/srv/mediagoblin.example.org/mediagoblin/]) AC_PREFIX_DEFAULT([`pwd`])
dnl########################### dnl###########################