[freeside-commits] freeside Makefile,1.161,1.162

Ivan,,, ivan at wavetail.420.am
Mon May 12 20:49:05 PDT 2008


Update of /home/cvs/cvsroot/freeside
In directory wavetail.420.am:/tmp/cvs-serv30535

Modified Files:
	Makefile 
Log Message:
better place for initial configuration to be stored and retreived from than the initial tarball...

Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/Makefile,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- Makefile	30 Apr 2008 23:42:05 -0000	1.161
+++ Makefile	13 May 2008 03:49:02 -0000	1.162
@@ -21,6 +21,11 @@
 MASON_HANDLER = ${FREESIDE_CONF}/handler.pl
 MASONDATA = ${FREESIDE_CACHE}/masondata
 
+#where to put the default configuraiton used by freeside-setup to initialize
+#a new database (not used after that).  primarily of interest to distro
+#package maintainers
+DIST_CONF = ${FREESIDE_CONF}/default_conf
+
 #mod_perl v1
 #APACHE_VERSION = 1
 #mod_perl v2 prereleases up to and including 1.999_21
@@ -201,6 +206,7 @@
 	  s|%%%FREESIDE_LOCK%%%|${FREESIDE_LOCK}|g;\
 	  s|%%%FREESIDE_CACHE%%%|${FREESIDE_CACHE}|g;\
 	  s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\
+	  s|%%%DIST_CONF%%%|${DIST_CONF}|g;\
 	" blib/script/*
 
 install-perl-modules: perl-modules
@@ -210,6 +216,11 @@
 	  || true
 	cd FS; \
 	make install UNINST=1
+	#install this for freeside-setup
+	install -d $(DIST_CONF)
+	#install conf/[a-z]* $(DEFAULT_CONF)
+	#CVS is not [a-z]
+	install `ls -d conf/[a-z]* | grep -v CVS` $(DIST_CONF)
 
 dev-perl-modules: perl-modules
 	[ -d ${PERL_INC_DEV_KLUDGE}/FS -a ! -L ${PERL_INC_DEV_KLUDGE}/FS ] \



More information about the freeside-commits mailing list