diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
| tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /graphics/glfw | |
| parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
| download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip | |
Notes
Diffstat (limited to 'graphics/glfw')
| -rw-r--r-- | graphics/glfw/Makefile | 1 | ||||
| -rw-r--r-- | graphics/glfw/files/patch-compile.sh | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/graphics/glfw/Makefile b/graphics/glfw/Makefile index e1f0fe06fee9..ee0e810f0eac 100644 --- a/graphics/glfw/Makefile +++ b/graphics/glfw/Makefile @@ -24,7 +24,6 @@ do-configure: @(cd ${WRKSRC} && \ ${SETENV} CC="${CC}" \ CFLAGS="${CFLAGS}" \ - X11BASE="${X11BASE}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" ./compile.sh) do-install: diff --git a/graphics/glfw/files/patch-compile.sh b/graphics/glfw/files/patch-compile.sh index 6097ed6d0ede..6428fd309850 100644 --- a/graphics/glfw/files/patch-compile.sh +++ b/graphics/glfw/files/patch-compile.sh @@ -22,10 +22,10 @@ - LFLAGS="$LFLAGS -L/usr/X11R6/lib" - INCS="-I/usr/X11R6/include" - echo " X11 libraries location: /usr/X11R6/lib" 1>&6 -+elif [ -r "${X11BASE}/lib" ]; then -+ LFLAGS="$LFLAGS -L${X11BASE}/lib" -+ INCS="-I${X11BASE}/include" -+ echo " X11 libraries location: ${X11BASE}/lib" 1>&6 ++elif [ -r "${LOCALBASE}/lib" ]; then ++ LFLAGS="$LFLAGS -L${LOCALBASE}/lib" ++ INCS="-I${LOCALBASE}/include" ++ echo " X11 libraries location: ${LOCALBASE}/lib" 1>&6 # X11R5 in /usr/X11R5/lib ? elif [ -r "/usr/X11R5/lib" ]; then LFLAGS="$LFLAGS -L/usr/X11R5/lib" @@ -46,7 +46,7 @@ int main() {; return 0;} EOF -+CFLAGS="${CFLAGS} -I${X11BASE}/include" ++CFLAGS="${CFLAGS} -I${LOCALBASE}/include" + if { (eval echo $config_script: \"$compile\") 1>&5; (eval $compile) 2>&5; }; then rm -rf conftest* |