diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-03-07 18:47:07 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-03-07 18:47:07 +0000 |
| commit | 697842ddc15e1d92e4dfc653038de309a1a20e8d (patch) | |
| tree | f5395e6b296bb80aa4441fcebcf51aa24a3cb148 | |
| parent | 353e21c13948820776376e724ade98b408603727 (diff) | |
use --enable-target-install framework to add install-linux to the install target for the web portal
svn path=/trunk/; revision=5120
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 3 |
3 files changed, 21 insertions, 1 deletions
@@ -611,6 +611,7 @@ OPENSSL_SO_GLOB OPENSSL_CONFIG_COMMAND TOP_LEVEL_SUBDIRS SETUP_PY_INSTALL_LAYOUT +GUI_INSTALL_TARGETS RTR_ORIGIN_INSTALL_TARGETS RCYNIC_INSTALL_TARGETS RCYNIC_HTML_DIR @@ -4669,6 +4670,7 @@ esac RCYNIC_INSTALL_TARGETS='install-always' RTR_ORIGIN_INSTALL_TARGETS='install-always' +GUI_INSTALL_TARGETS='install-always' if test $use_rcynic_jail = yes then @@ -4679,11 +4681,19 @@ if test $enable_target_installation = yes then RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf" RTR_ORIGIN_INSTALL_TARGETS="$RTR_ORIGIN_INSTALL_TARGETS install-postconf" + + case $host_os in + linux*) + GUI_INSTALL_TARGETS="$GUI_INSTALL_TARGETS install-linux" + ;; + esac + fi + # Now a bunch of checks to figure out what we can do with Python. If # we don't have Python at all, none of the rest of this matters. If # we do have Python, we need to check for required packages and diff --git a/configure.ac b/configure.ac index b98f4ca3..fd489467 100644 --- a/configure.ac +++ b/configure.ac @@ -376,6 +376,7 @@ AC_SUBST(RCYNIC_HTML_DIR) RCYNIC_INSTALL_TARGETS='install-always' RTR_ORIGIN_INSTALL_TARGETS='install-always' +GUI_INSTALL_TARGETS='install-always' if test $use_rcynic_jail = yes then @@ -386,10 +387,18 @@ if test $enable_target_installation = yes then RCYNIC_INSTALL_TARGETS="$RCYNIC_INSTALL_TARGETS install-postconf" RTR_ORIGIN_INSTALL_TARGETS="$RTR_ORIGIN_INSTALL_TARGETS install-postconf" + + case $host_os in + linux*) + GUI_INSTALL_TARGETS="$GUI_INSTALL_TARGETS install-linux" + ;; + esac + fi AC_SUBST(RCYNIC_INSTALL_TARGETS) AC_SUBST(RTR_ORIGIN_INSTALL_TARGETS) +AC_SUBST(GUI_INSTALL_TARGETS) # Now a bunch of checks to figure out what we can do with Python. If # we don't have Python at all, none of the rest of this matters. If diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index bb5283f2..ff0e288c 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -19,6 +19,7 @@ sysconfdir=@sysconfdir@ INSTALL = @INSTALL@ WSGI_DAEMON_PROCESS=@WSGI_DAEMON_PROCESS@ WSGI_PROCESS_GROUP=@WSGI_PROCESS_GROUP@ +GUI_INSTALL_TARGETS=@GUI_INSTALL_TARGETS@ INSTDIR=${DESTDIR}$(datarootdir)/rpki SYSCONFDIR=${DESTDIR}${sysconfdir}/rpki @@ -43,7 +44,7 @@ edit = sed \ apache.conf: $(srcdir)/apache.conf.in Makefile $(edit) $@.in > $@ -install: all install-always +install: all $(GUI_INSTALL_TARGETS) install-always: if test -d $(INSTDIR)/wsgi; then :; else ${INSTALL} -d $(INSTDIR)/wsgi; fi |