X-Git-Url: http://gitweb/?a=blobdiff_plain;f=imlib2%2FPkgfile;h=aa59ed4fe4102a8262d38326604121993cac4723;hb=05e6dd9dd0887d4252d56ef4ad3dcdf9c6081124;hp=a6f09a7e8e9ed4a9271b7c6092d8928fa3ee3280;hpb=e5ddbb4e0b51b2f9e9512d14252e2c9d13a39c12;p=attic%2Fports%2Fopt-cross.git

diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile
index a6f09a7..aa59ed4 100644
--- a/imlib2/Pkgfile
+++ b/imlib2/Pkgfile
@@ -7,7 +7,7 @@
 
 name=imlib2
 version=1.4.2
-release=1
+release=2
 source=(http://dl.sourceforge.net/sourceforge/enlightenment/$name-$version.tar.bz2)
 
 build() {
@@ -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