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

diff --git a/Makefile b/Makefile
index dc86c6065..95ffbf27b 100644
--- a/Makefile
+++ b/Makefile
@@ -115,13 +115,19 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.14.2/
 
-VERSION=`grep '^$VERSION' FS/FS.pm | cut -d\' -f2`
-TAG=freeside_`echo ${VERSION} | perl -pe 's/\./_/g'`
+VERSION := `grep '^$$VERSION' FS/FS.pm | cut -d\' -f2`
+TAG := freeside_`grep '^$$VERSION' FS/FS.pm | cut -d\' -f2 | perl -pe 's/\./_/g'`
 
-DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
+#DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
 TEXMFHOME := "\$$TEXMFHOME"
 
+ver:
+	@echo "${VERSION}"
+
+tag:
+	@echo "${TAG}"
+
 help:
 	@echo "supported targets:"
 	@echo "                   create-database create-config"
@@ -334,7 +340,7 @@ configure-rt:
 	            --with-db-dba=${DB_USER} \
 	            --with-db-database=${RT_DB_DATABASE} \
 	            --with-db-rt-user=${DB_USER} \
-	            --with-db-rt-pass=${DB_PASSWORD} \
+	            --with-db-rt-pass="${DB_PASSWORD}" \
 	            --with-web-user=freeside \
 	            --with-web-group=freeside \
 	            --with-rt-group=freeside \