From 732d94d25fd10fff65a378b03c3fca9bde403e95 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sun, 14 Jan 2007 03:52:21 +0000 Subject: fixup a whole steaming pile of insanity. When packages are configured, they should be configured with --prefix=/usr and we then need to use make DESTDIR=$(STAGING_DIR) install to get things installed into the staging directory. The current situation for many packages, which use --prefix=$(STAGING_DIR) results in the staging_dir paths getting compiled into the binary itself. This also adds in a pile of libtool fixups. Between broken pkgconfig, broken libtool handling, and broken --prefix settings, its a wonder things have worked as well as they have up till now. -Erik --- package/xorg/xorg-config.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/xorg/xorg-config.patch') diff --git a/package/xorg/xorg-config.patch b/package/xorg/xorg-config.patch index 9bfd56726..389801e1d 100644 --- a/package/xorg/xorg-config.patch +++ b/package/xorg/xorg-config.patch @@ -1,6 +1,6 @@ --- xc/config/cf/host.def~ Thu May 12 15:28:01 MDT 2005 +++ xc/config/cf/host.def Thu May 12 15:28:01 MDT 2005 -@@ -0,0 +1,44 @@ +@@ -0,0 +1,45 @@ +#define KDriveXServer YES +#define TinyXServer YES +#define XfbdevServer YES @@ -10,7 +10,8 @@ + +#define HasFreetype2 YES +#define Freetype2Dir REPLACE_STAGING_DIR -+#define HasFontconfig NO ++#define HasFontconfig YES ++#define FontconfigDir REPLACE_STAGING_DIR +#define HasLibpng YES +#define HasZlib YES +#define HaveLib64 NO -- cgit v1.2.3