X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=41b3e8c90d7b797959c1d1cdfe23a6a780f90e92;hp=79135e7a7f4aeb64c9478d885e4023808c0d8a8f;hb=43e42a04ae37ca7a84c05d9ff8b94d9f8cde6dcf;hpb=56a2965996454a0649d43ecbc062beda61106e21

diff --git a/Makefile b/Makefile
index 79135e7a7..41b3e8c90 100644
--- a/Makefile
+++ b/Makefile
@@ -123,8 +123,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.9.0cvs
-TAG=freeside_1_9_0
+VERSION=2.1.0cvs
+TAG=freeside_2_1_0
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -171,6 +171,7 @@ install-docs: docs
 	cp -r masondocs ${FREESIDE_DOCUMENT_ROOT}
 	chown -R freeside:freeside ${FREESIDE_DOCUMENT_ROOT}
 	cp htetc/handler.pl ${MASON_HANDLER}
+	cp htetc/htpasswd.logout ${FREESIDE_CONF}
 	[ ! -e ${MASONDATA} ] && mkdir ${MASONDATA} || true
 	chown -R freeside ${MASONDATA}
 
@@ -314,12 +315,6 @@ create-config: install-perl-modules
 	chmod 600 ${FREESIDE_CONF}/secrets
 	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}"
-	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
-	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
-
 	mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
 
@@ -333,7 +328,8 @@ create-config: install-perl-modules
 	install -d $(DIST_CONF)
 	#install conf/[a-z]* $(DEFAULT_CONF)
 	#CVS is not [a-z]
-	install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF)
+	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
+
 
 configure-rt:
 	cd rt; \
@@ -350,7 +346,8 @@ configure-rt:
 	            --with-db-rt-pass=${DB_PASSWORD} \
 	            --with-web-user=freeside \
 	            --with-web-group=freeside \
-	            --with-rt-group=freeside
+	            --with-rt-group=freeside \
+	            --with-web-handler=modperl2
 
 create-rt: configure-rt
 	[ -d /opt           ] || mkdir /opt           #doh
@@ -366,12 +363,12 @@ create-rt: configure-rt
 	|| true
 
 install-rt:
-	perl -p -i -e "\
+	[ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
+	[ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
 	  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_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
 
 clean:
 	rm -rf masondocs
@@ -389,7 +386,7 @@ clean:
 .PHONY: release
 release:
 	# Update the changelog
-	./CVS2CL
+	./bin/cvs2cl
 	cvs commit -m "Updated for ${VERSION}" ChangeLog
 
 	# Update the RPM specfile