X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=110cfa0c2da49f18579aff78efda6f60a954c13d;hb=b48548f7e5fb15aacc0040ae0557d05b87fecfb2;hp=bba2d7918cededa4f7bafda2d93b6e3fc3942d5c;hpb=e5aef8203d5e01873246eeecf67f3c214ea79220;p=freeside.git

diff --git a/Makefile b/Makefile
index bba2d7918..110cfa0c2 100644
--- a/Makefile
+++ b/Makefile
@@ -121,10 +121,10 @@ RT_PATH = /opt/rt3
 
 #only used for dev kludge now, not a big deal
 FREESIDE_PATH = `pwd`
-PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.1/
 
-VERSION=2.1.0cvs
-TAG=freeside_2_1_0
+VERSION=2.1.1cvs
+TAG=freeside_2_1_1
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -210,7 +210,7 @@ perl-modules:
 	" blib/lib/FS/part_export/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
-	" blib/lib/FS/cust_main/*.pm;\
+	" blib/lib/FS/cust_main/*.pm blib/lib/FS/cust_pkg/*.pm;\
 	perl -p -i -e "\
 	  s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
 	  s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
@@ -312,7 +312,7 @@ create-config: install-perl-modules
 	chown freeside ${FREESIDE_CONF}/secrets
 	chmod 600 ${FREESIDE_CONF}/secrets
 
-	echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+	/bin/echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
 	chmod 600 ${FREESIDE_CONF}/secrets
 	chown freeside ${FREESIDE_CONF}/secrets
 
@@ -405,7 +405,7 @@ release:
 	cvs commit -m "Updated for ${VERSION}" debian/changelog
 
 	# Make sure other people's changes are pulled in!
-	cvs update -d -P
+	cvs update -d -P || true #it exits 1...
 
 	# Tag the release
 	#cvs tag ${TAG}