makefile typo

diff --git a/Makefile b/Makefile
index 3b02625..f3fa1e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,12 @@
 
 DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 #DATASOURCE=DBI:mysql:freeside
 
 DATASOURCE = DBI:Pg:host=localhost;dbname=freeside
 #DATASOURCE=DBI:mysql:freeside

-#pgsql on some systems; check /etc/passwd

 
 DB_USER = freeside
 DB_PASSWORD=
 
 TEMPLATE = asp
 
 DB_USER = freeside
 DB_PASSWORD=
 
 TEMPLATE = asp

-#mason's a bit dodgy stil
+#mason's a bit dodgy still

 #TEMPLATE = mason
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
 #TEMPLATE = mason
 
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside


@@ -44,6 +43,7 @@ docs:
        make ${TEMPLATE}docs
 
 install-docs: docs
        make ${TEMPLATE}docs
 
 install-docs: docs

+       mv ${FREESIDE_DOCUMENT_ROOT} ${FREESIDE_DOCUMENT_ROOT}.`date +%Y%m%d%H%M%S`

        cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:
        cp -r ${TEMPLATE}docs ${FREESIDE_DOCUMENT_ROOT}
 
 perl-modules:


@@ -71,19 +71,19 @@ create-config: install-perl-modules
 
        [ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
        [ -d "${FREESIDE_CONF}/conf.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"

-       chown freeside "${FREESIDE_CONF/conf.${DATASOURCE}"
+       chown freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"

 
        [ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"
 
        [ -d "${FREESIDE_CONF}/counters.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"

-       chown freeside "${FREESIDE_CONF/counters.${DATASOURCE}"
+       chown freeside "${FREESIDE_CONF}/counters.${DATASOURCE}"

 
        [ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"
 
        [ -d "${FREESIDE_CONF}/cache.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/cache.${DATASOURCE}"

-       chown freeside "${FREESIDE_CONF/cache.${DATASOURCE}"
+       chown freeside "${FREESIDE_CONF}/cache.${DATASOURCE}"

 
        [ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"
 
        [ -d "${FREESIDE_CONF}/export.${DATASOURCE}" ] \
          || mkdir "${FREESIDE_CONF}/export.${DATASOURCE}"

-       chown freeside "${FREESIDE_CONF/export.${DATASOURCE}"
+       chown freeside "${FREESIDE_CONF}/export.${DATASOURCE}"

 
 clean:
        rm -rf aspdocs masondocs
 
 clean:
        rm -rf aspdocs masondocs

diff --git a/httemplate/docs/install.html b/httemplate/docs/install.html
index f2db59f..1d6022b 100644 (file)
--- a/httemplate/docs/install.html
+++ b/httemplate/docs/install.html
@@ -138,7 +138,7 @@ AuthUserFile /usr/local/etc/freeside/htpasswd
 require valid-user
 </Directory>
 </pre>
 require valid-user
 &lt;/Directory&gt;
 </pre>

-  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication; they're not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):
+  <li>Create one or more Freeside users (your internal sales/tech folks, not customer accounts).  These users are setup using using Apache authentication, not UNIX user accounts.  For example, using <a href="http://httpd.apache.org/docs/mod/mod_auth.html">mod_auth</a> (flat files):

     <ul>
       <li>First user:<font size="-1">
 <pre>$ su
     <ul>
       <li>First user:<font size="-1">
 <pre>$ su