X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=07d3914662a6752e40651bffa3572b985ecc4b9c;hb=77be6115a8972c8e7917fc9f80e30a6ba571a552;hp=be2a5a296d3bc8671948459c8ea8715f4db6076d;hpb=fdc37a9bdc0da568ed1629a8e572246336e25754;p=freeside.git

diff --git a/debian/rules b/debian/rules
index be2a5a296..07d391466 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ TMP     = $(CURDIR)/debian/$(PACKAGE)
 #DBC_SCRIPTS = $(TMP)/usr/share/dbconfig-common/scripts/freeside
 
 ##this is gotten from dbconfig-common
-#DB_TYPE = db_type_is_configured_during_pkg_install_by_dbconfig-common_not_at_build_time
+DB_TYPE = Pg
 
 #Data source
 DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
@@ -93,8 +93,8 @@ build-stamp:
 	dh_testdir
 	# Add commands to compile the package here
 	
-	( cd FS/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && [ -e Makefile ] || perl Makefile.PL && make )
-	
+	( cd FS/ && $(PERL) Makefile.PL INSTALLDIRS=vendor && $(MAKE) )
+	$(MAKE) perl-modules	
 	#install this for freeside-setup
 	install -d $(DIST_CONF)
 	install `ls -d conf/[a-z]* | grep -v CVS | grep -v '^conf/registries'` $(DIST_CONF)
@@ -128,8 +128,9 @@ install-stamp: build-stamp
 	install -d $(TMP)-webui/usr/local/etc/freeside/
 	install -d $(TMP)/usr/local/etc/freeside/
 	install -d $(FREESIDE_CACHE)/masondata #MASONDATA
+#	install -d $(TMP)-lib/usr/bin
 
-	( cd FS/ && $(MAKE) -e DESTDIR=${TMP} install)
+	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
 
         # Install configuration files
 	install -d -o freeside ${FREESIDE_CONF}
@@ -194,6 +195,7 @@ install-stamp: build-stamp
 	perl -p -i -e "\
           s'${TMP}?''g;\
         " ${TMP}-lib/usr/bin/* \
+	  ${TMP}-webui/usr/local/etc/freeside/handler.pl
 
 	#RT Config