X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=debian%2Frules;h=0d90a7fca3169b827c9dd614aa77bac0c0755bc4;hp=e69d411d22eee70357e9bef577c81344da75acfe;hb=bda8aa70a1b7e02fc38a43ac8c5e5770c5e0174f;hpb=ec90a3dc9531211c4878757f32928ccd95e48b29

diff --git a/debian/rules b/debian/rules
index e69d411d2..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)
@@ -125,12 +125,12 @@ 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
+#	install -d $(TMP)-lib/usr/bin
 
-	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install UNINST=1 )
+	( cd FS/ && $(MAKE) -e DESTDIR=${TMP}-lib install)
 
         # Install configuration files
 	install -d -o freeside ${FREESIDE_CONF}