ensure that the trainwreck which was 1.9.2 does not happen again

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 2f696dc..bba2d79 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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/*/*/*/*
@@ -204,6 +204,7 @@ perl-modules:
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
        " blib/lib/FS/Cron/*.pm;\
        perl -p -i -e "\
+         s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
          s|%%%FREESIDE_LOG%%%|${FREESIDE_LOG}|g;\
        " blib/lib/FS/part_export/*.pm;\
@@ -366,12 +367,12 @@ create-rt: configure-rt
        || true
 
 install-rt:
-       [ ${RT_ENABLED} -eq 1 ] && ( cd rt; make install ) || true
-       [ ${RT_ENABLED} -eq 1 ] && perl -p -i -e "\
+       if [ ${RT_ENABLED} -eq 1 ]; then ( cd rt; make install ); fi
+       if [ ${RT_ENABLED} -eq 1 ]; then perl -p -i -e "\
          s'%%%RT_DOMAIN%%%'${RT_DOMAIN}'g;\
          s'%%%RT_TIMEZONE%%%'${RT_TIMEZONE}'g;\
          s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
-       " ${RT_PATH}/etc/RT_SiteConfig.pm
+       " ${RT_PATH}/etc/RT_SiteConfig.pm; fi
 
 clean:
        rm -rf masondocs
@@ -403,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
+
+       # Tag the release
        #cvs tag ${TAG}
        cvs tag -F ${TAG}
 
@@ -426,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 )'
-