From: Victor Martinez <pitillo@ono.com>
Date: Wed, 17 Feb 2010 09:43:40 +0000 (+0000)
Subject: imlib2: Fixed X libs/includes.
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=df88ef5cb93b4740915f5920bcd00d3988271435;p=attic%2Fports%2Fopt-cross.git

imlib2: Fixed X libs/includes.
---

diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile
index 1589511..aa59ed4 100644
--- a/imlib2/Pkgfile
+++ b/imlib2/Pkgfile
@@ -23,8 +23,8 @@ build() {
   export BZ2LIBS="$DEFAULT_LIBS"
   export ZLIBLIBS="$DEFAULT_LIBS"
   export X_LIBS="$DEFAULT_LIBS -lX11 -lXext -lSM"
-  export my_libs="-lfreetype -lz -L$CLFS/usr/lib/X11 -lX11 -lXext -ldl -lm"
-  export my_includes="-I$CLFS/usr/include/freetype2 -I$CLFS/usr/include/X11"
+  export my_libs="-lfreetype -lz -L$CLFS/usr/lib -lX11 -lXext -ldl -lm"
+  export my_includes="-I$CLFS/usr/include/freetype2 -I$CLFS/usr/include"
   
   ./configure --build=$CHOST \
               --host=$CTARGET \
@@ -40,10 +40,10 @@ build() {
               --x-includes=$CLFS/usr/include/X11 \
               --x-libraries=$CLFS/usr/lib/X11
 
-  sed "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib/X11|g" -i imlib2-config
+  sed "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib|g" -i imlib2-config
   find -type f -name 'Makefile*' \
     -exec sed -e "s|-I/usr/include|-I$CLFS/usr/include|g" \
-    -e "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib/X11|g" \
+    -e "s|-L/usr/X11R6/lib|-L$CLFS/usr/lib|g" \
     -e "s|-L/usr/lib|-L$CLFS/usr/lib|g" -i {} \;
   
   make