[freeside-commits] branch master updated. 0c9ebb4513cc31abb424d56cd9e6290da1814167

[Jeremy Davis]

The branch, master has been updated
       via  0c9ebb4513cc31abb424d56cd9e6290da1814167 (commit)
      from  f7ef9328911395ea38ec64c407e8463825829083 (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 0c9ebb4513cc31abb424d56cd9e6290da1814167
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Mon Nov 17 16:21:12 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(-)