X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=dc86c6065a6686e1c687934d796203a55dac8cd1;hb=9c021c0763dd09b8457d16389d693fdfe858ca82;hp=bd87669811798860f0781b470cff8d52187851bf;hpb=b7cb0504d5b4bf302745e9ac296410147000e007;p=freeside.git

diff --git a/Makefile b/Makefile
index bd8766981..dc86c6065 100644
--- a/Makefile
+++ b/Makefile
@@ -115,8 +115,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 
-VERSION=3.0git
-TAG=freeside_3_0
+VERSION=`grep '^$VERSION' FS/FS.pm | cut -d\' -f2`
+TAG=freeside_`echo ${VERSION} | perl -pe 's/\./_/g'`
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -180,9 +180,6 @@ perl-modules:
 	[ -e Makefile ] || perl Makefile.PL; \
 	make; \
 	perl -p -i -e "\
-	  s/%%%VERSION%%%/${VERSION}/g;\
-	" blib/lib/FS.pm;\
-	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
 	  s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
@@ -426,13 +423,13 @@ release:
 	git pull
 
 	# Tag the release
-	git tag ${TAG}
+	git tag -f ${TAG}
 
 	#cd /home/ivan
-	git archive ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz
+	git archive --prefix=freeside-${VERSION}/ ${TAG} | gzip -9 >freeside-${VERSION}.tar.gz
 
 	scp freeside-${VERSION}.tar.gz ivan@420.am:/var/www/www.sisd.com/freeside/
-	mv freeside-${VERSION} freeside-${VERSION}.tar.gz ..
+	mv freeside-${VERSION}.tar.gz ..
 
 	#these things failing should not make release target fail, so: "|| true"