[freeside-commits] branch master updated. 3a41a6e8016f62a1f46830c4fce3fe583b275229

[Jeremy Davis]

The branch, master has been updated
       via  3a41a6e8016f62a1f46830c4fce3fe583b275229 (commit)
      from  ce200f25b9d4eebeddac0e8a9a58dbab6a54645b (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 3a41a6e8016f62a1f46830c4fce3fe583b275229
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Fri Nov 7 16:01:09 2014 -0500

    Ticket #31999 Fix issues with ordering of debian package builds

diff --git a/debian/rules b/debian/rules
index 7bf8aed..be6ce51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,12 +122,14 @@ install-stamp: build-stamp
 
 	install -d $(FREESIDE_DOCUMENT_ROOT)
 	install -d $(TMP)-webui/usr/local/etc/freeside/
+	install -d $(TMP)/usr/local/etc/freeside/
 	install -d $(FREESIDE_CACHE)/masondata #MASONDATA
-	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
 
+        # Install configuration files, hack what to do???
+	$(MAKE) -e DESTDIR=$(TMP) create-config
 
-	# Ugly hack, why is handler.pl not being "handled" by install-docs
-	install -D htetc/handler.pl DESTDIR=$(FREESIDE_CACHE)
+	# Install interfaces
+	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
 
 	# Create Apache configurations
 	install -d $(APACHE_CONF)
@@ -139,20 +141,22 @@ install-stamp: build-stamp
          s'${TMP}(-webui)?''g;\
         "  $(TMP)-webui/etc/freeside/apache2/*
 
-        # Install configuration files, hack what to do???
-	$(MAKE) -e DESTDIR=$(TMP) create-config
+	# Install init
 	$(MAKE) -e DESTDIR=$(TMP) install-init
 
 	#hack the build dir out of Freeside too.  oh yeah, sucky.
 	perl -p -i -e "\
 	  s'${TMP}(-webui)?''g;\
-	" ${TMP}-webui/usr/local/etc/freeside/handler.pl 
+	" ${TMP}/usr/local/etc/freeside/handler.pl \
+	  ${TMP}/usr/share/perl5/FS/* \
+	  ${TMP}/usr/share/perl5/FS/*/* \
+	  ${TMP}/usr/bin/*
 
-	#back the build dur out of lib
+	#hack the build dur out of lib
 	perl -p -i -e "\
           s'${TMP}-lib?''g;\
 	  s'${TMP}(-webui)?''g;\
-        " ${TMP}-webui/usr/local/etc/freeside/handler.pl \
+        " ${TMP}/usr/local/etc/freeside/handler.pl \
 	  ${TMP}-lib/usr/share/perl5/FS/*.pm \
 	  ${TMP}-lib/usr/share/perl5/FS/*/*.pm 
         

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

Summary of changes:
 debian/rules |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)