changeset: 2114:cae85636d2d4
user: Kris Maglione <jg_AT_suckless.org>
date: Sun Apr 22 00:20:05 2007 -0400
summary: Add some config search paths.
diff -r 7c51519be9e7 -r cae85636d2d4 config.mk
--- a/config.mk Sun Apr 22 00:12:25 2007 -0400
+++ b/config.mk Sun Apr 22 00:20:05 2007 -0400
@@ -38,3 +38,4 @@ LIBIXP = ${LIBDIR}/libixp.a
#LDFLAGS += -lsocket -lnsl
#CFLAGS += -xtarget=ultra
+
diff -r 7c51519be9e7 -r cae85636d2d4 util/genconfig
--- a/util/genconfig Sun Apr 22 00:12:25 2007 -0400
+++ b/util/genconfig Sun Apr 22 00:20:05 2007 -0400
@@ -91,17 +91,21 @@ unset force
#for i in LIBX11 LIBICONV LIBIXP INCX11; do
# eval "unset $i ${i}_orig"; done
-libs="$LIBDIR:$(echo "$INCPATH"|sed 's,/include\(:\|$\),/lib\1,g')$(echo "$LDFLAGS"|sed 's,-L\([^ ]*\),:\1,g')"
+libs="$LIBDIR:$(echo "$INCPATH"|sed 's,/include\(:\|$\),/lib\1,g')"
+libs="$libs$(echo "$LDFLAGS"|sed 's,-L\([^ ]*\),:\1,g')"
+libs="$libs:/usr/local/lib:/opt/local/lib"
eval "libs=\"$libs\""
LIBIXP=${LIBIXP%/libixp.a}
+INCPATH="$INCPATH:/usr/local/include:/opt/local/include"
oifs="$IFS"
IFS=:
-findinc INCX11 X11/Xlib.h $INCS /usr/X11R6/include /usr/x11/include /usr/x11/include /usr/X11/include \
+findinc INCX11 X11/Xlib.h $INCPATH /usr/X11R6/include /usr/x11/include /usr/x11/include /usr/X11/include \
/usr/openwin/include /opt/x11/include /opt/X11/include
-findinc INCICONV iconv.h $INCS /usr/local/include
+findinc INCICONV iconv.h $INCPATH
-findlib LIBX11 X11 $libs /usr/X11R6/lib /usr/X11/lib /usr/openwin/lib /usr/x11/lib /opt/X11 /opt/x11
+findlib LIBX11 X11 $libs /usr/X11R6/lib /usr/X11/lib /usr/openwin/lib /usr/x11/lib /opt/X11 /opt/x11 \
+ /usr/local/lib /opt/local/lib
findlib LIBICONV iconv $libs
findlib LIBIXP ixp ${ROOT}/libixp $libs
LIBIXP=$(echo "$LIBIXP"|sed 's,^-L\([^ ]*\) -l\([^ ]*\)$,\1/lib\2.a,')
Received on Fri Jun 01 2007 - 03:09:58 UTC
This archive was generated by hypermail 2.2.0 : Sun Jul 13 2008 - 15:57:02 UTC