projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ac12ee
)
Debian package changes
author
Jeremy Davis
<jeremyd@freeside.biz>
Tue, 26 May 2015 17:41:14 +0000
(13:41 -0400)
committer
Jeremy Davis
<jeremyd@freeside.biz>
Tue, 26 May 2015 17:41:14 +0000
(13:41 -0400)
debian/rules
patch
|
blob
|
history
diff --git
a/debian/rules
b/debian/rules
index
85f6a61
..
e82254e
100755
(executable)
--- 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 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 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?
export FREESIDE_RESTART = /bin/true
#XXX root?