summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2015-10-28 14:28:38 -0700
committerIvan Kohler <ivan@freeside.biz>2015-10-28 14:28:38 -0700
commit42e6fdc16b285430d50607489aa3e1394fafbc16 (patch)
treee7d2955e5a67156048a80e5040e95ef4f593fc9c
parent3888fd6d1902f93c19d62df186e04617357f58c5 (diff)
fix week expand / collapse images under RT 4.2, RT#34237, RT#13852
-rw-r--r--Makefile3
-rwxr-xr-xdebian/rules1
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3af5da812..91b14b8a8 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ FREESIDE_URL = "http://localhost/freeside/"
#for now, same db as specified in DATASOURCE... eventually, otherwise?
RT_DB_DATABASE = freeside
-TORRUS_ENABLED = 0
+TORRUS_ENABLED = 1
# for auto-version updates, so we can "make release" more things automatically
RPM_SPECFILE = rpm/freeside.spec
@@ -400,6 +400,7 @@ create-rt: configure-rt
install-rt:
if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+ if [ ${RT_ENABLED} -eq 1 ]; then cp -r ${RT_PATH}/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/ ;fi
if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
diff --git a/debian/rules b/debian/rules
index a7f2b72d0..e7f5bd8a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -266,6 +266,7 @@ install-stamp: build-stamp
install -d $(RT_PATH)/share
( cd rt; $(MAKE) config-install dirs files-install fixperms instruct )
+ cp -r ${RT_PATH}/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/
##hack the build dir out of RT. yeah, sucky.