X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=df85a062a943f1ac9179688de396dff5e5a81807;hb=ae257597c5b7f8c3f5cce2f0fd8a062eda226f4c;hp=8847cdee12b4dacda9e507139b9d8f13739f95c7;hpb=ca174c00cc87a433675641dcfa91f78b6322c303;p=freeside.git

diff --git a/Makefile b/Makefile
index 8847cdee1..df85a062a 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
 
@@ -143,8 +143,6 @@ help:
 	@echo "                   install-rt install-texmf"
 	@echo "                   install-selfservice update-selfservice"
 	@echo
-	@echo "                   install-texmf-forced"
-	@echo
 	@echo "                   dev dev-docs dev-perl-modules"
 	@echo
 	@echo "                   masondocs alldocs docs"
@@ -202,9 +200,11 @@ perl-modules:
 	perl -p -i -e "\
 	  s/%%%SELFSERVICE_USER%%%/${SELFSERVICE_USER}/g;\
 	  s/%%%SELFSERVICE_MACHINES%%%/${SELFSERVICE_MACHINES}/g;\
+	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
 	" blib/lib/FS/Cron/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
 	" blib/lib/FS/part_export/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
@@ -240,12 +240,6 @@ dev-perl-modules: perl-modules
 	ln -sf ${FREESIDE_PATH}/FS/blib/lib/FS ${PERL_INC_DEV_KLUDGE}/FS
 
 install-texmf:	
-	test -e `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty || \
-	install -D -o freeside -m 444 etc/fslongtable.sty \
-          `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
-	texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
-
-install-texmf-forced:	
 	install -D -o freeside -m 444 etc/fslongtable.sty \
           `kpsewhich -expand-var \\\$$TEXMFLOCAL`/tex/generic/fslongtable.sty
 	texhash `kpsewhich -expand-var \\\$$TEXMFLOCAL`
@@ -395,12 +389,13 @@ clean:
 .PHONY: release
 release:
 	# Update the changelog
-	./CVS2CL
+	./bin/cvs2cl
 	cvs commit -m "Updated for ${VERSION}" ChangeLog
 
 	# Update the RPM specfile
 	cvs edit ${RPM_SPECFILE}
 	perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+	perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
 	cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
 
 	# Update the Debian changelog