[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478
Mike Hommey
glandium at debian.org
Sat Apr 12 19:56:56 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 509550f394120d52d6a1bb336339d0498402ef3c
Author: Mike Hommey <glandium at debian.org>
Date: Sat Apr 12 21:07:39 2008 +0200
Don't build GtkLauncher and DumpRenderTree with rpath.
libtool does the right thing when running in-build-tree programs anyways.
diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index 2ba6400..8c407db 100644
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -19,8 +19,6 @@ Programs_GtkLauncher_CFLAGS = \
Programs_GtkLauncher_LDADD = \
libwebkit-1.0.la
-Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs
-
# DumpRenderTree
Programs_DumpRenderTree_CPPFLAGS = \
-I$(srcdir)/WebKitTools/DumpRenderTree \
@@ -46,5 +44,3 @@ Programs_DumpRenderTree_CXXFLAGS = \
Programs_DumpRenderTree_LDADD = \
libwebkit-1.0.la
-
-Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
diff --git a/debian/changelog b/debian/changelog
index a0ca641..7c1dc1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ webkit (0~svn31841-1) UNRELEASED; urgency=low
divert anything, since we don't clash with older files anymore.
* debian/rules: Ugly hack to add -Wl,--as-needed without it getting reordered
by libtool.
+ * WebKitTools/GNUmakefile.am: Don't build GtkLauncher and DumpRenderTree
+ with rpath.
-- Mike Hommey <glandium at debian.org> Sat, 12 Apr 2008 11:47:32 +0200
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list