diff options
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/Makefile.in | 37 | ||||
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 15 |
2 files changed, 14 insertions, 38 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 6a92433e..1ec9cc4b 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -33,23 +33,27 @@ abs_top_srcdir = @abs_top_srcdir@ abs_top_builddir= @abs_top_builddir@ srcdir = @srcdir@ +SETUP_PY_INSTALL_LAYOUT = @SETUP_PY_INSTALL_LAYOUT@ + # PID files seem to go into /var/run/ on every platform we support. # We could make this an autoconf substitution if anything ever cares, # but let's keep it simple for now. -PID_DIR = /var/run/rpkid +PID_DIR = ${DESTDIR}/var/run/rpkid SETUP_PY = \ AC_CFLAGS='${CFLAGS}' \ AC_LDFLAGS='${LDFLAGS}' \ AC_LIBS='${LIBS}' \ - AC_SBINDIR='${DESTDIR}${sbindir}' \ + AC_SBINDIR='${sbindir}' \ AC_SCRIPTS='${SCRIPTS}' \ AC_ABS_BUILDDIR='${abs_builddir}' \ - AC_LIBEXECDIR='${DESTDIR}${libexecdir}' \ + AC_LIBEXECDIR='${libexecdir}' \ AC_AUX_SCRIPTS='${AUX_SCRIPTS}' \ ${PYTHON} setup.py +SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'` + POW_SO = rpki/POW/_POW.so SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ @@ -108,7 +112,7 @@ clean:: rm -f ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} install:: - ${SETUP_PY} install --record installed + ${SETUP_PY} install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed @echo @echo "== Default configuration file location is ${sysconfdir}/rpki.conf ==" @echo @@ -120,19 +124,6 @@ uninstall deinstall:: distclean:: rm -f installed -installation-manifest:: - echo >>${abs_top_builddir}/installation-manifest D %%PYTHON_SITELIBDIR%%/rpki/POW - echo >>${abs_top_builddir}/installation-manifest F %%PYTHON_SITELIBDIR%%/${POW_SO} - for i in ${SCRIPTS}; do echo >>${abs_top_builddir}/installation-manifest F %%SBINDIR%%/`echo $$i | sed 's=.*/==g'`; done - for i in ${AUX_SCRIPTS}; do echo >>${abs_top_builddir}/installation-manifest F %%LIBEXECDIR%%/`echo $$i | sed 's=.*/==g'`; done - find rpki -name .svn -prune -o -name TODO -prune -o -type f -print | awk '\ - {print "F %%PYTHON_SITELIBDIR%%/" $$0} \ - /\.py$$/ {print "F %%PYTHON_SITELIBDIR%%/" $$0 "c"} \ - ' >>${abs_top_builddir}/installation-manifest - find rpki -name .svn -prune -o -type d -print | awk '\ - {print "D %%PYTHON_SITELIBDIR%%/" $$0} \ - ' >>${abs_top_builddir}/installation-manifest - dont-run-trang: touch *.rng @@ -201,7 +192,7 @@ distclean:: clean docclean cd tests; ${MAKE} $@ rm -f TAGS Makefile -all install clean test distclean deinstall uninstall installation-manifest:: +all install clean test distclean deinstall uninstall:: @for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done # Scripts @@ -209,24 +200,24 @@ all install clean test distclean deinstall uninstall installation-manifest:: COMPILE_PYTHON = \ rm -f $@; \ AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_RPKI_CONFIG_DIR='${DESTDIR}${sysconfdir}' \ + AC_RPKI_CONFIG_DIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \ chmod 555 $@ COMPILE_DJANGO = \ rm -f $@; \ AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_PYTHONPATH='${DESTDIR}${sysconfdir}/rpki' \ + AC_PYTHONPATH='${sysconfdir}/rpki' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-django-script.py <$? >$@; \ chmod 555 $@ COMPILE_SETTINGS = \ rm -f $@; \ AC_SECRET_KEY='${SECRET_KEY}' \ - AC_LOCALSTATEDIR='${DESTDIR}${localstatedir}' \ - AC_DATAROOTDIR='${DESTDIR}${datarootdir}' \ + AC_LOCALSTATEDIR='${localstatedir}' \ + AC_DATAROOTDIR='${datarootdir}' \ AC_DJANGO_DIR='${DJANGO_DIR}' \ - AC_SYSCONFDIR='${DESTDIR}${sysconfdir}' \ + AC_SYSCONFDIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/subst-vars.py <$? >$@ rpki-sql-backup: rpki-sql-backup.py diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index e9af1cbe..0a6e90da 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -59,20 +59,5 @@ deinstall uninstall: rm -rf $(INSTDIR)/media $(INSTDIR)/wsgi rm -rf $(SYSCONFDIR)/apache.conf $(SYSCONFDIR)/settings.py $(SYSCONFDIR)/settings.pyc -installation-manifest: - echo >>${abs_top_builddir}/installation-manifest D %%SYSCONFDIR%%/rpki - echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki - echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/wsgi - echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media - echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media/css - echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media/img - echo >>${abs_top_builddir}/installation-manifest D %%DATAROOTDIR%%/rpki/media/js - echo >>${abs_top_builddir}/installation-manifest F %%SYSCONFDIR%%/rpki/apache.conf - echo >>${abs_top_builddir}/installation-manifest F %%SYSCONFDIR%%/rpki/settings.py - echo >>${abs_top_builddir}/installation-manifest F %%DATAROOTDIR%%/rpki/wsgi/rpki.wsgi - find $(srcdir)/../rpki/gui/app/static/css $(srcdir)/../rpki/gui/app/static/js $(srcdir)/../rpki/gui/app/static/img \ - -name .svn -prune -o -type f -print | \ - sed 's=$(srcdir)/../rpki/gui/app/static=F %%DATAROOTDIR%%/rpki/media=' >>${abs_top_builddir}/installation-manifest - test: @true |