keep version in FS.pm instead of Makefile

2 files changed, 3 insertions, 6 deletions

diff --git a/FS/FS.pm b/FS/FS.pm
index c3a1ac2f6..1aa10c1a8 100644
--- a/FS/FS.pm
+++ b/FS/FS.pm
@@ -3,7 +3,7 @@ package FS;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '%%%VERSION%%%';
+$VERSION = '2.3.3';
 
 #find missing entries in this file with:
 # for a in `ls *pm | cut -d. -f1`; do grep 'L<FS::'$a'>' ../FS.pm >/dev/null || echo "missing $a" ; done
diff --git a/Makefile b/Makefile
index 7207c2fa5..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=2.3.3git
-TAG=freeside_2_3_3
+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; \