X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Frules;h=d82978cfd13016b533b79fab64ed03fb772f4666;hp=7bf8aed68314d4e4670226f0770749e72bf8b583;hb=707368aa7db1cecdd05b74c8531249a1e1370823;hpb=53ab539ee0cd55cecccc75c6c7cff44964d9f904

diff --git a/debian/rules b/debian/rules
index 7bf8aed68..d82978cfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ TMP     = $(CURDIR)/debian/$(PACKAGE)
 ##this is gotten from dbconfig-common
 #DB_TYPE = db_type_is_configured_during_pkg_install_by_dbconfig-common_not_at_build_time
 
+#Data source
+DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
+
 #no chance, it doesn't get backslash-interpolted now...
 ##DEBVERSION                    = `head -1 debian/changelog | cut -d')' -f1 | cut -c11-`
 #DEBVERSION                    = 1.7.3~rc2-1
@@ -36,7 +39,8 @@ export FREESIDE_LOG = $(TMP)/usr/local/etc/freeside
 export FREESIDE_LOCK = $(TMP)/usr/local/etc/freeside
 export FREESIDE_CACHE = $(TMP)/usr/local/etc/freeside
 export FREESIDE_EXPORT = $(TMP)/usr/local/etc/freeside
-expory FREESIDE_SS = $(TMP)/usr/share/docs/freeside
+export FREESIDE_SS = $(TMP)/usr/share/docs/freeside
+export DIST_CONF = ${FREESIDE_CONF}/default_conf
 
 #XXX own subdir?
 #export MASON_HANDLER          = /usr/share/freeside/handler.pl
@@ -89,9 +93,11 @@ build-stamp:
 	dh_testdir
 	# Add commands to compile the package here
 	
-	( cd FS/ && $(PERL) Makefile.PL INSTALLDIRS=vendor )
-
-	$(MAKE) -e DESTDIR=${TMP}-lib perl-modules
+	( cd FS/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && [ -e Makefile ] || perl Makefile.PL && make )
+	
+	#install this for freeside-setup
+	install -d $(DIST_CONF)
+	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
 
 	#TEST#
 
@@ -118,16 +124,42 @@ install-stamp: build-stamp
 	# Add here commands to install package into
 	# debian/<package>-whatever.
 
-	( cd FS/ && $(MAKE) -e DESTDIR=$(TMP)-lib install )
-
 	install -d $(FREESIDE_DOCUMENT_ROOT)
+	install -d $(TMP)-lib/usr/bin/
 	install -d $(TMP)-webui/usr/local/etc/freeside/
+	install -d $(TMP)/usr/local/etc/freeside/
 	install -d $(FREESIDE_CACHE)/masondata #MASONDATA
-	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
 
+	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
+
+        # Install configuration files
+	install -d -o freeside ${FREESIDE_CONF}
+
+	touch ${FREESIDE_CONF}/secrets
+	chown freeside ${FREESIDE_CONF}/secrets
+	chmod 600 ${FREESIDE_CONF}/secrets
+
+	/bin/echo -e "${DATASOURCE}\n${DB_USER}\n${DB_PASSWORD}" >${FREESIDE_CONF}/secrets
+	chmod 600 ${FREESIDE_CONF}/secrets
+	chown freeside ${FREESIDE_CONF}/secrets
 
-	# Ugly hack, why is handler.pl not being "handled" by install-docs
-	install -D htetc/handler.pl DESTDIR=$(FREESIDE_CACHE)
+	mkdir "${FREESIDE_CACHE}/counters.${DATASOURCE}"
+	chown freeside "${FREESIDE_CACHE}/counters.${DATASOURCE}"
+
+	mkdir "${FREESIDE_CACHE}/cache.${DATASOURCE}"
+	chown freeside "${FREESIDE_CACHE}/cache.${DATASOURCE}"
+
+	mkdir "${FREESIDE_EXPORT}/export.${DATASOURCE}"
+	chown freeside "${FREESIDE_EXPORT}/export.${DATASOURCE}"
+
+	#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 | grep -v '^conf/registries'` $(DIST_CONF)
+
+	# Install interfaces
+	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
 
 	# Create Apache configurations
 	install -d $(APACHE_CONF)
@@ -139,20 +171,22 @@ install-stamp: build-stamp
          s'${TMP}(-webui)?''g;\
         "  $(TMP)-webui/etc/freeside/apache2/*
 
-        # Install configuration files, hack what to do???
-	$(MAKE) -e DESTDIR=$(TMP) create-config
+	# Install init
 	$(MAKE) -e DESTDIR=$(TMP) install-init
 
 	#hack the build dir out of Freeside too.  oh yeah, sucky.
 	perl -p -i -e "\
 	  s'${TMP}(-webui)?''g;\
-	" ${TMP}-webui/usr/local/etc/freeside/handler.pl 
+	" ${TMP}/usr/local/etc/freeside/handler.pl \
+	  ${TMP}/usr/share/perl5/FS/* \
+	  ${TMP}/usr/share/perl5/FS/*/* \
+	  ${TMP}/usr/bin/*
 
-	#back the build dur out of lib
+	#hack the build dur out of lib
 	perl -p -i -e "\
           s'${TMP}-lib?''g;\
 	  s'${TMP}(-webui)?''g;\
-        " ${TMP}-webui/usr/local/etc/freeside/handler.pl \
+        " ${TMP}/usr/local/etc/freeside/handler.pl \
 	  ${TMP}-lib/usr/share/perl5/FS/*.pm \
 	  ${TMP}-lib/usr/share/perl5/FS/*/*.pm 
         
@@ -183,9 +217,11 @@ install-stamp: build-stamp
 		--with-web-handler=modperl2 )
 
         ##(create-rt)
-        #$(MAKE) -e create-rt
+	#$(MAKE) -e DESTDIR=${TMP}-lib create-rt
 	install -d $(RT_PATH)
-	( cd rt; make install )
+	install -d $(RT_PATH)/share
+
+	( cd rt; $(MAKE) install )
 	
 	##hack the build dir out of RT.  yeah, sucky.
 
@@ -208,7 +244,7 @@ install-stamp: build-stamp
 
 	dh_install
 
-	touch $@
+	#touch $@
 
 binary-arch:
 # We have nothing to do here for an architecture-independent package
@@ -230,7 +266,6 @@ binary-indep: build install
 	dh_link
 	dh_compress 
 	dh_fixperms
-	dh_installdeb
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb