[X2Go-Commits] [pale-moon] 06/38: debian/rules: backport LIB_DIR from Firefox 52 build.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit dccd147f4f62225fec51768d07e683714af07db7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jun 29 07:57:54 2018 +0200

    debian/rules: backport LIB_DIR from Firefox 52 build.
---
 debian/changelog | 1 +
 debian/rules     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8dc83b6..cdb206c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add non-parallel stamps/dummy target.
     - Add clean rules for stamps and config.{guess,sub} files.
     - Add stamps/configure-palemoon target.
+    - Backport LIB_DIR from Firefox 52 build.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
   * debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 4cd2eb1..bc07fa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,8 @@ $(call lazy,DEB_BUILD_ARCH_ENDIAN,$$(shell dpkg-architecture -qDEB_BUILD_ARCH_EN
 
 export SHELL=/bin/bash
 
+LIB_DIR := /usr/lib/palemoon
+
 LDFLAGS := -Wl,--as-needed
 
 # Reduce memory usage of the linker at the expense of processing time
@@ -95,7 +97,8 @@ stamps/configure-palemoon:: stamps/prepare-configure debian/palemoon.mozconfig
 	ASFLAGS="-g" \
 	$(CONFIGURE_ENV) \
 	../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr $(CONFIGURE_FLAGS) \
-		--with-default-mozilla-five-home=/usr/lib/palemoon
+		--with-default-mozilla-five-home=$(LIB_DIR)
+
 
 %:
 	dh $@ --parallel

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git