X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=95ffbf27ba95ddea20fa8a05024fa1a6e5c3a8f5;hb=8c450aab9bae89373c2c1b35c85597bb52299de3;hp=b603b8cb7a285401b115908a66bb0430db57d4b7;hpb=4745efea9b2308b1fba8a8180a1a0b5da2986794;p=freeside.git diff --git a/Makefile b/Makefile index b603b8cb7..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=3.0git -TAG=freeside_3_0 +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" @@ -180,9 +186,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; \ @@ -337,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 \