X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=6ec108c02aa01957ce9c54116cc3630766390fc5;hb=5dc522149a7ad8363ce46f8ff6b3133b2d3d3cdf;hp=2937b2018f6744c224f5438d846d732a2fa570e6;hpb=6a724b70e321ef79e882b42ae3b909792352aaec;p=freeside.git

diff --git a/Makefile b/Makefile
index 2937b2018..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
@@ -76,6 +81,7 @@ htmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
 	[ -e DONT_REBUILD_DOCS ] || bin/pod2x
 
 forcehtmlman:
@@ -83,6 +89,7 @@ forcehtmlman:
 	[ -e ./httemplate/docs/man/bin ] || mkdir httemplate/docs/man/bin
 	[ -e ./httemplate/docs/man/FS ] || mkdir httemplate/docs/man/FS
 	[ -e ./httemplate/docs/man/FS/UI ] || mkdir httemplate/docs/man/FS/UI
+	[ -e ./httemplate/docs/man/FS/part_export ] || mkdir httemplate/docs/man/FS/part_export
 	bin/pod2x
 
 install-docs: docs
@@ -138,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}"