[freeside-commits] branch FREESIDE_3_BRANCH updated. ec90a3dc9531211c4878757f32928ccd95e48b29

Jeremy Davis jeremyd at 420.am
Mon Nov 17 13:22:30 PST 2014


The branch, FREESIDE_3_BRANCH has been updated
       via  ec90a3dc9531211c4878757f32928ccd95e48b29 (commit)
      from  c84d0c513a89e48f3d4b234e054b3b6f7487825d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec90a3dc9531211c4878757f32928ccd95e48b29
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Mon Nov 17 16:22:15 2014 -0500

     Ticket #2916 Debian Packages

diff --git a/debian/rules b/debian/rules
index 69ea5f7..e69d411 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,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#
 
@@ -123,10 +125,13 @@ install-stamp: build-stamp
 	# debian/<package>-whatever.
 
 	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
 
+	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install UNINST=1 )
+
         # Install configuration files
 	install -d -o freeside ${FREESIDE_CONF}
 

-----------------------------------------------------------------------

Summary of changes:
 debian/rules |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)




More information about the freeside-commits mailing list