[X2Go-Commits] [pale-moon] 05/05: debian/rules: replace hardcoded locations with $(LIB_DIR).
git-admin at x2go.org
git-admin at x2go.org
Mon Sep 17 04:14:09 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pale-moon.
commit 6f331da111a4c7f5d9f64d4a6977559341bf50b0
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Sep 17 04:06:34 2018 +0200
debian/rules: replace hardcoded locations with $(LIB_DIR).
---
debian/changelog | 1 +
debian/rules | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93d69ef..7260092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -83,6 +83,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
- Handle include files by moving the versionated
/usr/include/palemoon-$VER directory to /usr/include/palemoon and
afterwards its contents to /usr/lib/palemoon-devel/include/.
+ - Replace hardcoded locations with $(LIB_DIR).
* 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 a504aa0..2fbd47b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -208,11 +208,11 @@ endif
# Fixup permissions
find debian/tmp/usr/share debian/tmp/$(LIB_DIR)-devel/include -type f -print0 | xargs -0 chmod 644
- chmod +x debian/tmp/usr/lib/palemoon-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file.
+ chmod +x debian/tmp/$(LIB_DIR)-devel/sdk/bin/xpcshell || : # Failure not fatal since we might not have this file.
# Replace some installed files by symlinks
for d in lib bin; do \
- cd "$(CURDIR)/debian/tmp/usr/lib/palemoon-devel/sdk/$$d"; \
+ cd "$(CURDIR)/debian/tmp/$(LIB_DIR)-devel/sdk/$$d"; \
for f in *; do \
if [ -f "$(CURDIR)/debian/tmp$(LIB_DIR)/$$f" ]; then \
rm -f $$f ; ln -s $(LIB_DIR)/$$f $$f; \
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
More information about the x2go-commits
mailing list