[freeside-commits] branch FREESIDE_4_BRANCH updated. 63a5cebd18a9f21c66a7ed93a8dc888c595f85a4

Ivan ivan at 420.am
Thu Feb 4 11:18:09 PST 2016


The branch, FREESIDE_4_BRANCH has been updated
       via  63a5cebd18a9f21c66a7ed93a8dc888c595f85a4 (commit)
      from  be2b537f97b57fc865f31248d59755df6caae2a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63a5cebd18a9f21c66a7ed93a8dc888c595f85a4
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Feb 4 11:18:07 2016 -0800

    fix static RT image copy

diff --git a/Makefile b/Makefile
index a90b6cc..8a3077a 100644
--- a/Makefile
+++ b/Makefile
@@ -400,7 +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 cp -r rt/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 aa87745..b04ebf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -266,7 +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/
+	cp -r rt/share/static/images ${FREESIDE_DOCUMENT_ROOT}/rt/NoAuth/
 	
 	##hack the build dir out of RT.  yeah, sucky.
 

-----------------------------------------------------------------------

Summary of changes:
 Makefile     |    2 +-
 debian/rules |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list