X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=a280889cb5051f7fe27479b879a2a38362987795;hb=7153190ee1bfeb6d3ad9e6da270a41a949333a7e;hp=faaea2a91262fa8fa3d1030d10505d4d19557227;hpb=cdf8b54b84822ab35ee95f6cdf6239ce533be9b6;p=freeside.git

diff --git a/Makefile b/Makefile
index faaea2a91..a280889cb 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,11 @@ FREESIDE_EXPORT = /usr/local/etc/freeside
 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 @@ perl-modules:
 	  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 @@ install-perl-modules: perl-modules
 	  || 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 ] \
@@ -256,7 +267,7 @@ install-selfservice:
 update-selfservice:
 	for MACHINE in ${SELFSERVICE_MACHINES}; do \
 	  RSYNC_RSH=ssh rsync -rlptz fs_selfservice/FS-SelfService/ ${SELFSERVICE_INSTALL_USER}@$$MACHINE:FS-SelfService ;\
-	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; perl Makefile.PL && make" ;\
+	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; make clean; perl Makefile.PL && make" ;\
 	  ssh ${SELFSERVICE_INSTALL_USER}@$$MACHINE "cd FS-SelfService; sudo make install" ;\
 	done
 
@@ -353,7 +364,7 @@ clean:
 release:
 	# Update the changelog
 	./CVS2CL
-	cvs commit -m "Updated for ${VERSION}" -ko ChangeLog
+	cvs commit -m "Updated for ${VERSION}" ChangeLog
 
 	# Update the RPM specfile
 	cvs edit ${RPM_SPECFILE}