[freeside-commits] branch master updated. f21bc7ca7e1c94b073004569a8506811898e15c4

Jeremy Davis jeremyd at 420.am
Wed Nov 19 13:06:52 PST 2014


The branch, master has been updated
       via  f21bc7ca7e1c94b073004569a8506811898e15c4 (commit)
      from  933897259d1e64fdc12c612f924db3b039a9ffdf (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 f21bc7ca7e1c94b073004569a8506811898e15c4
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Wed Nov 19 16:06:26 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