fix problems using inventory for UID (and other fields controlled by check in svc_acc...

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 43f6422..f39cfce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -115,10 +115,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.8.8/
+PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.10.0/
 
-VERSION=1.7.3
-TAG=freeside_1_7_3
+VERSION=1.7.4rc3
+TAG=freeside_1_7_4rc3
 
 DEBVERSION = `echo ${VERSION} | perl -pe 's/(\d)([a-z])/\1~\2/'`-1
 
@@ -164,6 +164,7 @@ install-docs: docs
        cp htetc/handler.pl ${MASON_HANDLER}
          perl -p -i -e "\
            s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+           s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
            s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \
            s'%%%MASONDATA%%%'${MASONDATA}'g;\
          " ${MASON_HANDLER}
@@ -365,6 +366,7 @@ release:
        # Update the RPM specfile
        cvs edit ${RPM_SPECFILE}
        perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+       perl -p -i -e "s/\d+[^\}]+/1/ if /%define\s+release\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
        cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
 
        # Update the Debian changelog