CRUX-ARM : Home

Home :: Documentation :: Download :: Development :: Community :: Ports :: Packages :: Bugs :: Links :: About :: Donors
imlib2: Fixed X libs/includes.
authorVictor Martinez <pitillo@ono.com>
Wed, 17 Feb 2010 09:43:40 +0000 (09:43 +0000)
committerVictor Martinez <pitillo@ono.com>
Wed, 17 Feb 2010 09:43:52 +0000 (09:43 +0000)
imlib2/Pkgfile

index 15895113aa52580f9fd66d724c2e62d019922417..aa59ed4fe4102a8262d38326604121993cac4723 100644 (file)
@@ -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