revert OS specific post install rules added in [5119]

svn path=/trunk/; revision=5177

3 files changed, 1 insertions, 33 deletions

diff --git a/configure b/configure
index 3ea6f6b5..dc0e3ad0 100755
--- a/configure
+++ b/configure
@@ -610,7 +610,6 @@ 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
@@ -4528,7 +4527,6 @@ esac
 
 RCYNIC_INSTALL_TARGETS='install-always'
 RTR_ORIGIN_INSTALL_TARGETS='install-always'
-GUI_INSTALL_TARGETS='install-always'
 
 if test $use_rcynic_jail = yes
 then
@@ -4539,19 +4537,11 @@ 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 617ccc75..33ac6f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -387,7 +387,6 @@ 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
@@ -398,18 +397,10 @@ 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 396ef171..53e7f0c8 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -14,16 +14,13 @@ sharedstatedir=@sharedstatedir@
 bindir=@bindir@
 sbindir=@sbindir@
 libexecdir=@libexecdir@
-sysconfdir=@sysconfdir@
 
 INSTALL = @INSTALL@
 WSGI_DAEMON_PROCESS=@WSGI_DAEMON_PROCESS@
 WSGI_PROCESS_GROUP=@WSGI_PROCESS_GROUP@
-GUI_INSTALL_TARGETS=@GUI_INSTALL_TARGETS@
 RCYNIC_HTML_DIR=@RCYNIC_HTML_DIR@
 
 INSTDIR=${DESTDIR}$(datarootdir)/rpki
-SYSCONFDIR=${DESTDIR}${sysconfdir}/rpki
 
 # automatically built sources
 BUILD=apache.conf
@@ -46,9 +43,7 @@ edit = sed \
 apache.conf: $(srcdir)/apache.conf.in Makefile
 	$(edit) $@.in > $@
 
-install: all $(GUI_INSTALL_TARGETS)
-
-install-always:
+install: all
 	if test -d $(INSTDIR)/wsgi; then :; else ${INSTALL} -d $(INSTDIR)/wsgi; fi
 	if test -d $(INSTDIR)/media; then :; else ${INSTALL} -d $(INSTDIR)/media; fi
 	if test -d $(INSTDIR)/media/css; then :; else ${INSTALL} -d $(INSTDIR)/media/css; fi
@@ -61,16 +56,8 @@ install-always:
 	${INSTALL} -m 644 $(srcdir)/../rpki/gui/app/static/js/*  $(INSTDIR)/media/js
 	${INSTALL} -m 644 $(srcdir)/../rpki/gui/app/static/img/* $(INSTDIR)/media/img
 
-install-linux:
-	(echo PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/sbin && t=$$(hexdump -n 1 -e '"%u"' /dev/urandom) && echo "$$(($$t % 60)) */2 * * * nobody ${datarootdir}/rpki/routeviews.sh") > ${DESTDIR}/etc/cron.d/rpkigui-routeviews
-	chmod 644 ${DESTDIR}/etc/cron.d/rpkigui-routeviews
-	ln -sf ${DESTDIR}${sbindir}/rpkigui-check-expired /etc/cron.daily/rpkigui-check-expired
-
 deinstall uninstall:
 	rm -rf $(INSTDIR)/media $(INSTDIR)/wsgi
 
-deinstall-linux:
-	rm -f /etc/cron.d/rpkigui-routeviews /etc/cron.daily/rpkigui-check-expired
-
 test:
 	@true