projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix self-service fallout from clickjacking fix, RT#39881
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
bab47e4
..
91b14b8
100644
(file)
--- 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
#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
# for auto-version updates, so we can "make release" more things automatically
RPM_SPECFILE = rpm/freeside.spec
@@
-129,7
+129,7
@@
RT_PATH = /opt/rt3
#only used for dev kludge now, not a big deal
FREESIDE_PATH = `pwd`
#only used for dev kludge now, not a big deal
FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.
14
.2/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.
20
.2/
VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2`
TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'`
VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2`
TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'`
@@
-194,7
+194,8
@@
install-docs: docs
" ${MASON_HANDLER} || true
mkdir -p ${FREESIDE_EXPORT}/profile
chown freeside ${FREESIDE_EXPORT}/profile
" ${MASON_HANDLER} || true
mkdir -p ${FREESIDE_EXPORT}/profile
chown freeside ${FREESIDE_EXPORT}/profile
- [ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+ rm -r ${MASONDATA}
+ mkdir ${MASONDATA}
chown -R freeside ${MASONDATA}
dev-docs:
chown -R freeside ${MASONDATA}
dev-docs:
@@
-268,8
+269,8
@@
dev-perl-modules: perl-modules
ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
install-texmf:
ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
install-texmf:
- install -D -o freeside -m 444 etc/
longtable
.sty \
- /usr/local/share/texmf/tex/latex/
longtable.sty
+ install -D -o freeside -m 444 etc/
*
.sty \
+ /usr/local/share/texmf/tex/latex/
texhash /usr/local/share/texmf
install-init:
texhash /usr/local/share/texmf
install-init:
@@
-399,6
+400,7
@@
create-rt: configure-rt
install-rt:
if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
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;\
if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\