diff options
| author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2001-12-24 04:37:06 +0000 |
|---|---|---|
| committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2001-12-24 04:37:06 +0000 |
| commit | 478425f9d07181a936c8d97f8a68aeaf4404b7aa (patch) | |
| tree | a0f2ffa54ce4b91dda3d802d51fb995075b0fe2f /games/gltron | |
| parent | Remove files/patch-Makefile (diff) | |
Fix compiliation errors
PORTDOCS support was already added by someone else
PR: 33128
Submitted by: tkato@prontomail.com
Notes
Notes:
svn path=/head/; revision=52077
Diffstat (limited to 'games/gltron')
| -rw-r--r-- | games/gltron/Makefile | 23 | ||||
| -rw-r--r-- | games/gltron/files/patch-ad | 6 |
2 files changed, 14 insertions, 15 deletions
diff --git a/games/gltron/Makefile b/games/gltron/Makefile index 7347063ab035..e5c48861b83c 100644 --- a/games/gltron/Makefile +++ b/games/gltron/Makefile @@ -23,27 +23,26 @@ SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config USE_X_PREFIX= yes USE_MESA= yes -GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= X11BASE="${X11BASE}" \ - LOCALBASE="${LOCALBASE}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ SDL_CONFIG="${SDL_CONFIG}" -pre-build: +CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lXext ${PTHREAD_LIBS} + +post-patch: ${PERL} -pi -e "s+#include <SDL\/+#include <+g" ${WRKSRC}/*.[ch] do-install: - @${MKDIR} ${PREFIX}/share/gltron - (cd ${WRKSRC} && ${TAR} -c -f - art data sounds) \ - | (cd ${PREFIX}/share/gltron && ${TAR} --unlink -x -f -) ${INSTALL_PROGRAM} ${WRKSRC}/gltron ${PREFIX}/bin - -post-install: + @${MKDIR} ${DATADIR} + ${TAR} -C ${WRKSRC} -cf - art data sounds | \ + ${TAR} -C ${DATADIR} --unlink -xf - .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/gltron + @${MKDIR} ${DOCSDIR} .for file in CHANGELOG CREDITS README - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gltron + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} .endfor .endif diff --git a/games/gltron/files/patch-ad b/games/gltron/files/patch-ad index 725c0c90fec6..2d5a41a186a8 100644 --- a/games/gltron/files/patch-ad +++ b/games/gltron/files/patch-ad @@ -8,7 +8,7 @@ $FreeBSD$ -LIBS='-L/usr/X11R6/lib' -+LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" ++LIBS="$LIBS $LDFLAGS" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -17,7 +17,7 @@ $FreeBSD$ -CFLAGS="" -+CFLAGS="$CFLAGS -I${X11BASE}/include -I${LOCALBASE}/include" ++CFLAGS="$CFLAGS $CPPFLAGS" # Check whether --enable-warn or --disable-warn was given. if test "${enable_warn+set}" = set; then @@ -26,7 +26,7 @@ $FreeBSD$ if test "x$enable_optimize" ; then - CFLAGS="$CFLAGS -O$enable_optimize" -+# CFLAGS="$CFLAGS -O$enable_optimize" ++ CFLAGS="$CFLAGS" fi # Check whether --enable-network or --disable-network was given. |