X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=a7f2b72d0c04727a9c0bb1afa838ddb2f74e6ec0;hb=ca8b9c43d93fce9dc821e03f9126ad47f4c1b016;hp=e3476d6866f69e10c31b7cfc63af9389c6126d44;hpb=0788d4bf43324dd87c224a43983c8066f9cb2cbe;p=freeside.git diff --git a/debian/rules b/debian/rules index e3476d686..a7f2b72d0 100755 --- a/debian/rules +++ b/debian/rules @@ -53,6 +53,7 @@ export INIT_FILE = $(TMP).init export INIT_INSTALL = /bin/true export HTTPD_RESTART = /bin/true export APACHE_CONF := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-webui/etc/apache2/conf-available" || echo "$(TMP)-webui/etc/apache2/conf.d") +export TORRUS_CONF := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-torrus/etc/apache2/conf-available" || echo "$(TMP)-torrus/etc/apache2/conf.d") export FREESIDE_RESTART = /bin/true #XXX root? @@ -77,6 +78,8 @@ export FREESIDE_URL = http://$(HOSTNAME)/freeside/ # (but leaving it for now, otherwise can't get RT to put files where we need em) export RT_PATH = $(TMP)/opt/rt3 +export TEXMF_PATH = $(TMP)-lib/usr/local/share/texmf/tex/latex + # This has to be exported to make some magic below work. export DH_OPTIONS @@ -166,9 +169,8 @@ install-stamp: build-stamp $(MAKE) -e DESTDIR=$(TMP)-webui install-docs # Install tex - install -D -o freeside -m 444 etc/longtable.sty \ - $(TMP)-lib/usr/local/share/texmf/tex/latex/longtable.sty - texhash $(TMP)-lib/usr/local/share/texmf + install -d ${TEXMF_PATH} + install -o freeside -m 444 etc/*.sty ${TEXMF_PATH} # Create Apache configurations install -d $(APACHE_CONF) @@ -225,6 +227,19 @@ install-stamp: build-stamp install -d ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/ cp -R ng_selfservice ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/ng_selfservice-DIST/ + # Torrus + + install -d ${TORRUS_CONF} + install -o root -m 755 htetc/freeside-torrus.conf $(TORRUS_CONF)/ + + ( cd torrus; \ + torrus_user=freeside var_user=freeside var_group=freeside ./configure; \ + $(MAKE) -e DESTDIR=${TMP}-torrus/; \ + $(MAKE) -e DESTDIR=${TMP}-torrus/ install; \ + perl -p -i -e "\ + s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ + " ${TMP}-torrus/usr/local/etc/torrus/conf/torrus-siteconfig.pl ) + #RT Config ( cd rt; \