projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
promo codes not unique...
[freeside.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
be53406
..
b23ee93
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-77,6
+77,9
@@
RT_DOMAIN = example.com
RT_TIMEZONE = US/Pacific;
#RT_TIMEZONE = US/Eastern;
RT_TIMEZONE = US/Pacific;
#RT_TIMEZONE = US/Eastern;
+#for now, same db as specified in DATASOURCE... eventually, otherwise?
+RT_DB_DATABASE = freeside
+
#---
#not changable yet
#---
#not changable yet
@@
-84,8
+87,8
@@
FREESIDE_CONF = /usr/local/etc/freeside
#rt/config.layout.in
RT_PATH = /opt/rt3
#rt/config.layout.in
RT_PATH = /opt/rt3
-VERSION=1.5.0pre
5
-TAG=freeside_1_5_0pre
5
+VERSION=1.5.0pre
6
+TAG=freeside_1_5_0pre
6
help:
@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
help:
@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@
-99,9
+102,6
@@
help:
aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
rm -rf aspdocs
cp -pr httemplate aspdocs
aspdocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
rm -rf aspdocs
cp -pr httemplate aspdocs
- perl -p -i -e "\
- s/%%%VERSION%%%/${VERSION}/g;\
- " aspdocs/index.html
touch aspdocs
touch aspdocs
@@
-111,9
+111,6
@@
masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*
( cd masondocs; \
../bin/masonize; \
)
( cd masondocs; \
../bin/masonize; \
)
- perl -p -i -e "\
- s/%%%VERSION%%%/${VERSION}/g;\
- " masondocs/index.html
touch masondocs
alldocs: aspdocs masondocs
touch masondocs
alldocs: aspdocs masondocs
@@
-160,7
+157,10
@@
install-docs: docs
perl-modules:
cd FS; \
[ -e Makefile ] || perl Makefile.PL; \
perl-modules:
cd FS; \
[ -e Makefile ] || perl Makefile.PL; \
- make
+ make; \
+ perl -p -i -e "\
+ s/%%%VERSION%%%/${VERSION}/g;\
+ " blib/lib/FS.pm
install-perl-modules: perl-modules
cd FS; \
install-perl-modules: perl-modules
cd FS; \
@@
-240,7
+240,7
@@
configure-rt:
./configure --enable-layout=Freeside\
--with-db-type=Pg \
--with-db-dba=${DB_USER} \
./configure --enable-layout=Freeside\
--with-db-type=Pg \
--with-db-dba=${DB_USER} \
- --with-db-database=
freeside
\
+ --with-db-database=
${RT_DB_DATABASE}
\
--with-db-rt-user=${DB_USER} \
--with-db-rt-pass=${DB_PASSWORD} \
--with-web-user=freeside \
--with-db-rt-user=${DB_USER} \
--with-db-rt-pass=${DB_PASSWORD} \
--with-web-user=freeside \
@@
-248,9
+248,12
@@
configure-rt:
--with-rt-group=freeside
create-rt: configure-rt
--with-rt-group=freeside
create-rt: configure-rt
+ [ -d /opt ] || mkdir /opt #doh
+ [ -d /opt/rt3 ] || mkdir /opt/rt3 #
+ [ -d /opt/rt3/share ] || mkdir /opt/rt3/share #
cd rt; make install
echo -e "${DB_PASSWORD}\n\\d sessions"\
cd rt; make install
echo -e "${DB_PASSWORD}\n\\d sessions"\
- | psql -U ${DB_USER} -W
freeside
2>&1\
+ | psql -U ${DB_USER} -W
${RT_DB_DATABASE}
2>&1\
| grep '^Did not find'\
&& rt/sbin/rt-setup-database --dba '${DB_USER}' \
--dba-password '${DB_PASSWORD}' \
| grep '^Did not find'\
&& rt/sbin/rt-setup-database --dba '${DB_USER}' \
--dba-password '${DB_PASSWORD}' \
@@
-275,8
+278,8
@@
clean:
#these are probably only useful if you're me...
upload-docs: forcehtmlman
#these are probably only useful if you're me...
upload-docs: forcehtmlman
- ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/d
evd
ocs
- scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/d
evd
ocs
+ ssh pouncequick.420.am rm -rf /var/www/www.sisd.com/freeside/docs
+ scp -pr httemplate/docs pouncequick.420.am:/var/www/www.sisd.com/freeside/docs
release: upload-docs
cd /home/ivan/freeside
release: upload-docs
cd /home/ivan/freeside