diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-06-13 15:18:37 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-06-13 15:18:37 -0700 |
| commit | 7beec7068e00be5ae1b2599fdf2b494bc19e31d0 (patch) | |
| tree | 055e1d25694ccfdac3a2d5aca79441cf7a3d89b5 /debian/rules | |
| parent | 9e8d2a5bafb21c42f54cdd9b3703e2f88a36e0a8 (diff) | |
| parent | eb6536b41456955fc425dba2e156a996e8fe2837 (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_3_BRANCH
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index 85f6a6147..e3476d686 100755 --- a/debian/rules +++ b/debian/rules @@ -46,14 +46,13 @@ export DIST_CONF = ${FREESIDE_CONF}/default_conf #export MASON_HANDLER = /usr/share/freeside/handler.pl export MASON_HANDLER=$(TMP)-webui/usr/local/etc/freeside/handler.pl -#export FREESIDE_DOCUMENT_ROOT = /usr/share/freeside/www -export APACHE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www') +export APACHE_VERSION := $(shell /usr/sbin/apache2 -v | grep -q '\/2\.4\.' && echo '2.4' || echo '2') +export APACHE_DOCUMENT_ROOT := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo '/var/www/html' || echo '/var/www') export FREESIDE_DOCUMENT_ROOT = $(TMP)$(APACHE_DOCUMENT_ROOT)/freeside export INIT_FILE = $(TMP).init export INIT_INSTALL = /bin/true export HTTPD_RESTART = /bin/true -#export APACHE_CONF = /etc/apache2/conf.d -export APACHE_CONF = $(TMP)-webui/etc/freeside/apache2 +export APACHE_CONF := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-webui/etc/apache2/conf-available" || echo "$(TMP)-webui/etc/apache2/conf.d") export FREESIDE_RESTART = /bin/true #XXX root? @@ -180,7 +179,7 @@ install-stamp: build-stamp perl -p -i -e "\ s'${TMP}(-webui)?''g;\ - " $(TMP)-webui/etc/freeside/apache2/* + " $(APACHE_CONF)/* # Install init $(MAKE) -e DESTDIR=$(TMP) install-init |