clean up some of the top-level files

[freeside.git] / Makefile

diff --git a/Makefile b/Makefile
index cf69f31..17a92c5 100644 (file)
--- 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
@@ -186,6 +186,7 @@ perl-modules:
        " blib/lib/FS.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_CONF%%%|${FREESIDE_CONF}|g;\
+         s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
        " blib/lib/FS/*.pm;\
        perl -p -i -e "\
          s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
@@ -236,6 +237,7 @@ install-apache:
          ) || 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:. ;\