From: Jeremy Davis <jeremyd@freeside.biz>
Date: Wed, 19 Nov 2014 21:08:05 +0000 (-0500)
Subject: Ticket #2916 Debian packages
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=bda8aa70a1b7e02fc38a43ac8c5e5770c5e0174f;hp=b05ecb709b4ff5cd10a4df93af3e1ca9b79732e2

Ticket #2916 Debian packages
---

diff --git a/debian/rules b/debian/rules
index be2a5a296..0d90a7fca 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}