From e0c4ea8276a7804f28530f6e610ea13cd73e633a Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 4 Nov 2008 22:29:02 +0000
Subject: [PATCH] matchbox: fix prefix

Closes #5946.
---
 package/matchbox/matchbox.mk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 31deef8c41..be570e72e5 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -222,7 +222,7 @@ $(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked xlib_libXext-inst
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
@@ -248,12 +248,12 @@ $(MATCHBOX_SNOTIFY_DIR)/.configured: $(MATCHBOX_SNOTIFY_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share \
 	--libdir=$(STAGING_DIR)/usr/lib \
-	--includedir=$(STAGING_DIR)/usr/include \
+	--includedir=/usr/include \
 	--with-x \
 	--x-includes=$(STAGING_DIR)/usr/include/X11 \
 	--x-libraries=$(STAGING_DIR)/usr/lib \
@@ -268,7 +268,7 @@ $(MATCHBOX_WM_DIR)/.configured: $(MATCHBOX_WM_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
@@ -293,7 +293,7 @@ $(MATCHBOX_SM_DIR)/.configured: $(MATCHBOX_SM_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
@@ -317,7 +317,7 @@ $(MATCHBOX_CN_DIR)/.configured: $(MATCHBOX_CN_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
@@ -340,12 +340,12 @@ $(MATCHBOX_PL_DIR)/.configured: $(MATCHBOX_PL_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
-	--libdir=$(STAGING_DIR)/usr/lib \
-	--includedir=$(STAGING_DIR)/usr/include \
+	--libdir=/usr/lib \
+	--includedir=/usr/include \
 	--enable-expat \
 	--with-expat-includes=$(STAGING_DIR)/usr/include \
 	--with-expat-lib=$(STAGING_DIR)/usr/lib \
@@ -364,7 +364,7 @@ $(MATCHBOX_DP_DIR)/.configured: $(MATCHBOX_DP_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
@@ -388,7 +388,7 @@ $(MATCHBOX_FK_DIR)/.configured: $(MATCHBOX_FK_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
@@ -412,7 +412,7 @@ $(MATCHBOX_KB_DIR)/.configured: $(MATCHBOX_KB_DIR)/.unpacked
 	--host=$(GNU_TARGET_NAME) \
 	--build=$(GNU_HOST_NAME) \
 	--disable-static \
-	--prefix=$(STAGING_DIR)/usr \
+	--prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
 	--datadir=/usr/share/matchbox \
-- 
2.30.2