X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=85f6a6147514a6d210b9a6be801b23645f7c913b;hb=96a13f50757181b21c66e6bd15840d7072f254da;hp=b501904245fb974d8487832655ba2d014e461623;hpb=f34ac99a5e160d2eac4fb2cfecce820d1cf9b7ed;p=freeside.git

diff --git a/debian/rules b/debian/rules
index b50190424..85f6a6147 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,8 @@ export DIST_CONF = ${FREESIDE_CONF}/default_conf
 export MASON_HANDLER=$(TMP)-webui/usr/local/etc/freeside/handler.pl
 
 #export FREESIDE_DOCUMENT_ROOT = /usr/share/freeside/www
-export FREESIDE_DOCUMENT_ROOT = $(TMP)-webui/var/www/freeside
+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
@@ -215,15 +216,15 @@ install-stamp: build-stamp
 	chown -R freeside ${TMP}-selfservice-lib/usr/local/freeside
 	chmod 600 ${TMP}-selfservice-lib/usr/local/freeside/selfservice_socket
 	
-	install -d -o freeside -g freeside ${TMP}-selfservice-ui/var/www/
-	cp -R fs_selfservice/FS-SelfService/cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST
-	chown freeside.freeside ${TMP}-selfservice-ui/var/www/selfservice-DIST/*.cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST/*/*.cgi;
-	chmod 755 ${TMP}-selfservice-ui/var/www/selfservice-DIST/*.cgi ${TMP}-selfservice-ui/var/www/selfservice-DIST/*/*.cgi
+	install -d -o freeside -g freeside ${TMP}-selfservice-ui$(APACHE_DOCUMENT_ROOT)/
+	cp -R fs_selfservice/FS-SelfService/cgi ${TMP}-selfservice-ui$(APACHE_DOCUMENT_ROOT)/selfservice-DIST
+	chown freeside.freeside ${TMP}-selfservice-ui$(APACHE_DOCUMENT_ROOT)/selfservice-DIST/*.cgi ${TMP}-selfservice-ui$(APACHE_DOCUMENT_ROOT)/selfservice-DIST/*/*.cgi;
+	chmod 755 ${TMP}-selfservice-ui$(APACHE_DOCUMENT_ROOT)/selfservice-DIST/*.cgi ${TMP}-selfservice-ui$(APACHE_DOCUMENT_ROOT)/selfservice-DIST/*/*.cgi
 
 	# NG-selfservice
 
-	install -d ${TMP}-ng-selfservice/var/www/
-	cp -R ng_selfservice ${TMP}-ng-selfservice/var/www/ng_selfservice-DIST/
+	install -d ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/
+	cp -R ng_selfservice ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/ng_selfservice-DIST/
 
 	#RT Config
 
@@ -250,7 +251,7 @@ install-stamp: build-stamp
 	install -d $(RT_PATH)
 	install -d $(RT_PATH)/share
 
-	( cd rt; $(MAKE) install )
+	( cd rt; $(MAKE) config-install dirs files-install fixperms instruct )
 	
 	##hack the build dir out of RT.  yeah, sucky.