X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=imlib2%2FPkgfile;h=5908783c837aca035e4b53149e67fb0fdfe66f20;hb=021b09a88088ef036945348a9901923bea28c446;hp=15895113aa52580f9fd66d724c2e62d019922417;hpb=7016991a98f56c15eb113db3dbe999b03a771968;p=attic%2Fports%2Fopt-cross.git

diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile
index 1589511..5908783 100644
--- a/imlib2/Pkgfile
+++ b/imlib2/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://freshmeat.net/projects/imlib2/
 # Packager: Matt Housh jaeger at morpheus dot net
 # Maintainer: Jose V Beneyto sepen at users dot sourceforge dot net
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Depends on: freetype libpng libtiff libungif xorg-libsm xorg-libxext
 
 name=imlib2
@@ -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