[freeside-commits] branch FREESIDE_3_BRANCH updated. bda8aa70a1b7e02fc38a43ac8c5e5770c5e0174f

Jeremy Davis jeremyd at 420.am
Wed Nov 19 13:08:07 PST 2014


The branch, FREESIDE_3_BRANCH has been updated
       via  bda8aa70a1b7e02fc38a43ac8c5e5770c5e0174f (commit)
      from  b05ecb709b4ff5cd10a4df93af3e1ca9b79732e2 (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 bda8aa70a1b7e02fc38a43ac8c5e5770c5e0174f
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Wed Nov 19 16:08:05 2014 -0500

    Ticket #2916 Debian packages

diff --git a/debian/rules b/debian/rules
index be2a5a2..0d90a7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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}

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

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




More information about the freeside-commits mailing list