X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=Makefile;h=2c2b7a5be7589c0ad380345722843dd384883b02;hp=4a2afd000851726b3bcbbdf36bdd549b4219c8f1;hb=4992785a9ee19e318d4f4ac144675da97abbfb3d;hpb=f5a81134be779b26688d3d4703840f3b038ca2f7

diff --git a/Makefile b/Makefile
index 4a2afd000..2c2b7a5be 100644
--- a/Makefile
+++ b/Makefile
@@ -15,21 +15,21 @@ MASONDATA = /usr/local/etc/freeside/masondata
 
 #deb
 FREESIDE_DOCUMENT_ROOT = /var/www/freeside
-#redhat
+#redhat, mandrake
 #FREESIDE_DOCUMENT_ROOT = /var/www/html/freeside
 #freebsd
 #FREESIDE_DOCUMENT_ROOT = /usr/local/www/data/freeside
 #openbsd
 #FREESIDE_DOCUMENT_ROOT = /var/www/htdocs/freeside
 
-#deb, redhat, others?
+#deb, redhat, mandrake, others?
 INIT_FILE = /etc/init.d/freeside
 #freebsd
 #INIT_FILE = /usr/local/etc/rc.d/011.freeside.sh
 
 #deb
 HTTPD_RESTART = /etc/init.d/apache restart
-#redhat
+#redhat, mandrake
 #HTTPD_RESTART = /etc/init.d/httpd restart
 #freebsd
 #HTTPD_RESTART = /usr/local/etc/rc.d/apache.sh stop; sleep 1; /usr/local/etc/rc.d/apache.sh start
@@ -38,9 +38,9 @@ HTTPD_RESTART = /etc/init.d/apache restart
 
 FREESIDE_RESTART = ${INIT_FILE} restart
 
-#deb, redhat, others?
+#deb, redhat, mandrake, others?
 INSTALLGROUP = root
-#freebsd,openbsd
+#freebsd, openbsd
 #INSTALLGROUP = wheel
 
 #edit the stuff below to have the daemons start
@@ -164,7 +164,8 @@ create-config: install-perl-modules
 
 	mkdir "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	rm -rf conf/registries #old dirs just won't go away
-	cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	#cp conf/[a-z]* "${FREESIDE_CONF}/conf.${DATASOURCE}"
+	cp `ls -d conf/[a-z]* | grep -v CVS` "${FREESIDE_CONF}/conf.${DATASOURCE}"
 	chown -R freeside "${FREESIDE_CONF}/conf.${DATASOURCE}"
 
 	mkdir "${FREESIDE_CONF}/counters.${DATASOURCE}"