[X2Go-Commits] [pale-moon] 81/216: debian/rules: /usr/lib/palemoon-devel/include is a symlink by default, so make sure to properly check for and remove it.
git-admin at x2go.org
git-admin at x2go.org
Sat Feb 16 02:43:01 CET 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository pale-moon.
commit 04a018a40a8c2367d2d16ff3eacb70014a99ebe4
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Sep 17 05:53:04 2018 +0200
debian/rules: /usr/lib/palemoon-devel/include is a symlink by default, so make sure to properly check for and remove it.
---
debian/changelog | 2 ++
debian/rules | 2 ++
2 files changed, 4 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 7260092..46988b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
/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).
+ - /usr/lib/palemoon-devel/include is a symlink by default, so make sure to
+ properly check for and remove it.
* 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 2fbd47b..167ed0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -202,6 +202,8 @@ endif
mv debian/tmp/usr/include/palemoon-* debian/tmp/usr/include/palemoon
# Stage headers into $(LIB_DIR)-devel/include.
+ test -L debian/tmp/$(LIB_DIR)-devel/include # Fail if it's not a symlink.
+ rm -f debian/tmp/$(LIB_DIR)-devel/include
install -d -m 755 debian/tmp$(LIB_DIR)-devel/include
mv debian/tmp/usr/include/palemoon/* debian/tmp$(LIB_DIR)-devel/include/
rmdir debian/tmp/usr/include/palemoon
--
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