diff options
| author | Rob Austein <sra@hactrn.net> | 2015-08-03 13:48:22 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-08-03 13:48:22 +0000 |
| commit | 1c3cb6cf2cf56824d3a12eabac5d59751be81f05 (patch) | |
| tree | cf2ac368a0249791fdb25eba49f8f0956c0c8269 | |
| parent | 3ab7f3f89fe30594ba063bc25da704005971f394 (diff) | |
Pull from trunk.
svn path=/branches/tk705/; revision=6087
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 3 insertions, 17 deletions
@@ -1383,7 +1383,7 @@ Optional Packages: --with-system-openssl Link against system copy of OpenSSL Some influential environment variables: - RCYNIC_DIR Where to put output files from rcynic and rtr-origin; also + RCYNIC_DIR Where to put output files from rcynic and rpki-rtr; also controls jail location for --enable-rcynic-jail APACHE_VERSION Version of Apache httpd, mostly used on FreeBSD where it @@ -4680,14 +4680,7 @@ case $host_os in RCYNIC_HTML_DIR="/usr/local/www/apache${APACHE_VERSION}/data/rcynic" ;; linux*) - if test -d /var/www/html - then - # RHEL/CentOS - RCYNIC_HTML_DIR='/var/www/html/rcynic' - else - # Ubuntu - RCYNIC_HTML_DIR='/var/www/rcynic' - fi + RCYNIC_HTML_DIR='/var/www/html/rcynic' ;; *) RCYNIC_HTML_DIR='' diff --git a/configure.ac b/configure.ac index 3b3cedbe..f85fb909 100644 --- a/configure.ac +++ b/configure.ac @@ -475,14 +475,7 @@ case $host_os in RCYNIC_HTML_DIR="/usr/local/www/apache${APACHE_VERSION}/data/rcynic" ;; linux*) - if test -d /var/www/html - then - # RHEL/CentOS - RCYNIC_HTML_DIR='/var/www/html/rcynic' - else - # Ubuntu - RCYNIC_HTML_DIR='/var/www/rcynic' - fi + RCYNIC_HTML_DIR='/var/www/html/rcynic' ;; *) RCYNIC_HTML_DIR='' |