projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in employee edit, fix form getting submitted before customer search can complete...
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
34e3fdd
..
b7b355c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-123,7
+123,7
@@
RT_PATH = /opt/rt3
FREESIDE_PATH = `pwd`
PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
FREESIDE_PATH = `pwd`
PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
-VERSION=1.9.2
cvs
+VERSION=1.9.2
TAG=freeside_1_9_2
DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
TAG=freeside_1_9_2
DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
@@
-203,6
+203,7
@@
perl-modules:
s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
" blib/lib/FS/Cron/*.pm;\
perl -p -i -e "\
s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
" blib/lib/FS/Cron/*.pm;\
perl -p -i -e "\
+ s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
" blib/lib/FS/part_export/*.pm;\
s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
" blib/lib/FS/part_export/*.pm;\
@@
-361,12
+362,12
@@
create-rt: configure-rt
|| true
install-rt:
|| true
install-rt:
- [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-
[ ${RT_ENABLED} -eq 1 ] &&
perl -p -i -e "\
+ if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+
if [ ${RT_ENABLED} -eq 1 ]; then
perl -p -i -e "\
s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
- " ${RT_PATH}/etc/RT_SiteConfig.pm
+ " ${RT_PATH}/etc/RT_SiteConfig.pm
; fi
clean:
rm -rf masondocs
clean:
rm -rf masondocs