diff options
author | ivan <ivan> | 2010-12-29 03:24:08 +0000 |
---|---|---|
committer | ivan <ivan> | 2010-12-29 03:24:08 +0000 |
commit | 4b1685d06af60d40ddf783cea4bdcef17cdaa84a (patch) | |
tree | 145141a89caab1fe1cb5a6a775c017819916bca7 /Makefile | |
parent | 54395e0be06cb94a65d25041f657836241e23b60 (diff) |
torrus skinning improvements, RT#10574
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -290,7 +290,7 @@ update-selfservice: ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\ done -install: install-perl-modules install-docs install-init install-apache install-rt install-texmf +install: install-perl-modules install-docs install-init install-apache install-rt install-torrus install-texmf deploy: install ${HTTPD_RESTART} @@ -382,12 +382,13 @@ configure-torrus: torrus_user=freeside var_user=freeside var_group=freeside ./configure install-torrus: - cd torrus; \ - make; \ - make install - perl -p -i -e "\ - s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ - " /usr/local/etc/torrus/conf/torrus-siteconfig.pl + if [ ${TORRUS_ENABLED} -eq 1 ]; then ( cd torrus; \ + make; \ + make install; \ + perl -p -i -e "\ + s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\ + " /usr/local/etc/torrus/conf/torrus-siteconfig.pl \ + );fi clean: rm -rf masondocs |