debian packages!

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index 81670fa..fd2f657 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,8 @@ INIT_INSTALL = /usr/sbin/update-rc.d freeside defaults 21 20
 
 #deb, suse
 HTTPD_RESTART = /etc/init.d/apache restart
+#deb w/apache2
+#HTTPD_RESTART = /etc/init.d/apache2 restart
 #redhat, fedora, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
@@ -64,9 +66,11 @@ HTTPD_RESTART = /etc/init.d/apache 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/apache/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+), apache1
 APACHE_CONF = /etc/apache/conf.d
+#deb (3.1+), apache2
+#APACHE_CONF = /etc/apache2/conf.d
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
@@ -101,6 +105,8 @@ FREESIDE_URL = "http://localhost/freeside/"
 #for now, same db as specified in DATASOURCE... eventually, otherwise?
 RT_DB_DATABASE = freeside
 
+RPM_SPECFILE = install/rpm/freeside.spec
+
 #---
 
 
@@ -111,8 +117,8 @@ RT_PATH = /opt/rt3
 FREESIDE_PATH = `pwd`
 PERL_INC_DEV_KLUDGE = /usr/local/share/perl/5.8.8/
 
-VERSION=1.7.2
-TAG=freeside_1_7_2
+VERSION=1.7.3rc1
+TAG=freeside_1_7_3rc1
 
 help:
        @echo "supported targets:"
@@ -229,11 +235,13 @@ 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
 
 install-selfservice:
+       [ -e ~freeside ] || cp -pr /etc/skel ~freeside && chown -R freeside ~freeside
        [ -e ~freeside/.ssh/id_dsa.pub ] || su - freeside -c 'ssh-keygen -t dsa'
        for MACHINE in ${SELFSERVICE_MACHINES}; do \
          scp -r fs_selfservice/FS-SelfService ${SELFSERVICE_INSTALL_USER}@$$MACHINE:. ;\
@@ -343,6 +351,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}