projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better error handling for re-imports
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
c47720b
..
eb762e1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-10,6
+10,8
@@
TEMPLATE = asp
#TEMPLATE = mason
ASP_GLOBAL = /usr/local/etc/freeside/asp-global
#TEMPLATE = mason
ASP_GLOBAL = /usr/local/etc/freeside/asp-global
+MASON_HANDLER = /usr/local/etc/freeside/handler.pl
+MASONDATA = /usr/local/etc/freeside/masondata
#deb, others?
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
#deb, others?
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
@@
-48,13
+50,16
@@
SIGNUP_MACHINE = localhost
SIGNUP_AGENTNUM = 2
SIGNUP_REFNUM = 2
SIGNUP_AGENTNUM = 2
SIGNUP_REFNUM = 2
+SELFSERVICE_USER = fs_selfservice
+SELFSERVICE_MACHINE = localhost
+
#---
#not changable yet
FREESIDE_CONF = /usr/local/etc/freeside
#---
#not changable yet
FREESIDE_CONF = /usr/local/etc/freeside
-VERSION=1.5.0pre
1
-TAG=freeside_1_5_0pre
1
+VERSION=1.5.0pre
2
+TAG=freeside_1_5_0pre
2
help:
@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
help:
@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@
-112,6
+117,9
@@
install-docs: docs
[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
[ "${TEMPLATE}" = "asp" -a ! -e ${ASP_GLOBAL} ] && mkdir ${ASP_GLOBAL} || true
[ "${TEMPLATE}" = "asp" ] && chown -R freeside ${ASP_GLOBAL} || true
[ "${TEMPLATE}" = "asp" ] && cp htetc/global.asa ${ASP_GLOBAL} || true
+ [ "${TEMPLATE}" = "mason" ] && cp htetc/handler.pl ${MASON_HANDLER} || true
+ [ "${TEMPLATE}" = "mason" -a ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
+ [ "${TEMPLATE}" = "mason" ] && chown -R freeside ${MASONDATA} || true
perl-modules:
cd FS; \
perl-modules:
cd FS; \
@@
-134,6
+142,8
@@
install-init:
s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
s/%%%SIGNUP_MACHINE%%%/${SIGNUP_MACHINE}/g;\
s/%%%SIGNUP_AGENTNUM%%%/${SIGNUP_AGENTNUM}/g;\
s/%%%SIGNUP_REFNUM%%%/${SIGNUP_REFNUM}/g;\
+ s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
+ s/%%%SELFSERVICE_MACHINE%%%/${SELFSERVICE_MACHINE}/g;\
" ${INIT_FILE}
install: install-perl-modules install-docs install-init
" ${INIT_FILE}
install: install-perl-modules install-docs install-init