aboutsummaryrefslogtreecommitdiff
path: root/package/libgtk2
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 22:26:56 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-08-11 22:26:56 +0000
commita2e5113512e893029a6b8c52b23ab0349ca76071 (patch)
treea303c3266b1a49f104497c3b7b86b226ab99bbbd /package/libgtk2
parent927c01dd4a45623df173880c2b54ec8024cd8964 (diff)
downloadbuildroot-a2e5113512e893029a6b8c52b23ab0349ca76071.tar.gz
buildroot-a2e5113512e893029a6b8c52b23ab0349ca76071.tar.bz2
Use STAGING_DIR/usr/lib instead of STAGING_DIR/lib
Diffstat (limited to 'package/libgtk2')
-rw-r--r--package/libgtk2/libgtk2.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index d2411c65f7..9379662822 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -88,7 +88,7 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
# The following is an truely evil hack!
# I dont yet understand why configure is not doing this right
# TODO: also remove 'odd-include-problem.patch' when this is fixed
- $(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/include/pango-1.0 -I$(STAGING_DIR)/include/cairo\',g" $(LIBGTK2_DIR)/configure
+ $(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/pango-1.0 -I$(STAGING_DIR)/usr/include/cairo\',g" $(LIBGTK2_DIR)/configure
$(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L$(STAGING_DIR)/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
(cd $(LIBGTK2_DIR); rm -rf config.cache; \
$(LIBGTK2_BUILD_ENV) \
@@ -105,13 +105,13 @@ $(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
- --includedir=/include \
+ --includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
--enable-static \
--with-x \
- --x-includes=$(STAGING_DIR)/include \
+ --x-includes=$(STAGING_DIR)/usr/include \
--x-libraries=$(STAGING_DIR)/lib \
--disable-glibtest \
--enable-explicit-deps=no \