X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=Makefile;h=3a8c7359f8c92ce0d28a737276b53fd9cd868bee;hb=562e1f24e713dc67e766dbb218336ea5179e5eb5;hp=a820cb1e6f7b043344340de58d2d0421fa422c8b;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/Makefile b/Makefile
index a820cb1e6..3a8c7359f 100644
--- a/Makefile
+++ b/Makefile
@@ -66,8 +66,8 @@ HTTPD_RESTART = /etc/init.d/apache2 restart
 #apache
 #HTTPD_RESTART = /usr/local/apache/bin/apachectl stop; sleep 10; /usr/local/apache/bin/apachectl startssl
 
-#(an include directory, not a file, "Include /etc/apachew/conf.d" in httpd.conf)
-#deb (3.1+), 
+#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
+#deb (3.1+), apache2
 APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
@@ -103,6 +103,8 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+RPM_SPECFILE = rpm/freeside.spec
+
 #---
 
 
@@ -232,6 +234,7 @@ install-apache:
 	    ( [ ${RT_ENABLED} -eq 1 ] && install -o root -m 755 htetc/freeside-rt.conf ${APACHE_CONF} || true ) && \
 	    perl -p -i -e "\
 	      s'%%%FREESIDE_DOCUMENT_ROOT%%%'${FREESIDE_DOCUMENT_ROOT}'g; \
+	      s'%%%FREESIDE_CONF%%%'${FREESIDE_CONF}'g; \
 	      s'%%%MASON_HANDLER%%%'${MASON_HANDLER}'g; \
 	    " ${APACHE_CONF}/freeside-*.conf \
 	  ) || true
@@ -346,6 +349,11 @@ clean:
 #release: upload-docs
 release:
 	cd /home/ivan/freeside
+
+	# Update the RPM specfile
+	perl -p -i -e "s/\d+[^\}]+/${VERSION}/ if /%define\s+version\s+(\d+[^\}]+)\}/;" ${RPM_SPECFILE}
+	cvs commit -m "Updated for ${VERSION}" ${RPM_SPECFILE}
+
 	#cvs tag ${TAG}
 	cvs tag -F ${TAG}