summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 66c83a0f5..6ec108c02 100644
--- a/Makefile
+++ b/Makefile
@@ -27,10 +27,10 @@ QUEUED_USER=ivan
#eventually this shouldn't be needed
FREESIDE_PATH = `pwd`
-PASSWD_USER = ivan
+PASSWD_USER = nostart
PASSWD_MACHINE = localhost
-SIGNUP_USER = ivan
+SIGNUP_USER = nostart
SIGNUP_MACHINE = localhost
SIGNUP_AGENTNUM = 2
SIGNUP_REFNUM = 2
@@ -40,10 +40,8 @@ SIGNUP_REFNUM = 2
#not changable yet
FREESIDE_CONF = /usr/local/etc/freeside
-VERSION=1.4.0pre14
-TAG=freeside_1_4_0_pre14
-#VERSION=1.4.0beta1
-#TAG=freeside_1_4_0_beta1
+VERSION=1.4.1beta1
+TAG=freeside_1_4_1beta1
help:
@echo "supported targets: aspdocs masondocs alldocs docs install-docs"
@@ -56,14 +54,21 @@ help:
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
+
masondocs: htmlman httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/* httemplate/*/*/*/*/*
rm -rf masondocs
cp -pr httemplate masondocs
( cd masondocs; \
../bin/masonize; \
)
+ perl -p -i -e "\
+ s/%%%VERSION%%%/${VERSION}/g;\
+ " masondocs/index.html
touch masondocs
alldocs: aspdocs masondocs
@@ -140,6 +145,7 @@ create-config: install-perl-modules
chown freeside ${FREESIDE_CONF}/secrets
mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
+ rm -rf conf/registries #old dirs just won't go away
cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"