certificates ala communigate, RT#7515

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index aca452f..b0d43ea 100644 (file)
--- 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.2cvs
+TAG=freeside_2_1_2
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -149,7 +149,7 @@ help:
        @echo "                   wikiman"
        @echo "                   perl-modules"
        #@echo
-       #@echo "                   upload-docs release update-webdemo"
+       #@echo "                   upload-docs release"
 
 
 masondocs: httemplate/* httemplate/*/* httemplate/*/*/* httemplate/*/*/*/*
@@ -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
 
@@ -404,6 +404,10 @@ release:
        dch -v ${DEBVERSION} -p "New upstream release"
        cvs commit -m "Updated for ${VERSION}" debian/changelog
 
+       # Make sure other people's changes are pulled in!
+       cvs update -d -P || true #it exits 1...
+
+       # Tag the release
        #cvs tag ${TAG}
        cvs tag -F ${TAG}
 
@@ -427,8 +431,3 @@ release:
 
        #update web demo self-service?
 
-update-webdemo:
-       ssh ivan@420.am '( cd freeside; cvs update -d -P )'
-       #ssh root@420.am '( cd /home/ivan/freeside; make clean; make deploy )'
-       ssh root@420.am '( cd /home/ivan/freeside; make deploy )'
-