diff options
| author | garbled <garbled@pkgsrc.org> | 2004-02-11 01:32:06 +0000 |
|---|---|---|
| committer | garbled <garbled@pkgsrc.org> | 2004-02-11 01:32:06 +0000 |
| commit | 552fe768fed8f438d6fa5a00f7c0217e47c8d99b (patch) | |
| tree | 179129d63ea488eb3f4c734a587c56b1f7252b31 /graphics | |
| parent | 83c0134322fe23dae3cac75e58fddf0972ac85c3 (diff) | |
| download | pkgsrc-552fe768fed8f438d6fa5a00f7c0217e47c8d99b.tar.gz | |
Now that PR 24378 has been fixed, take the hack out of Makefile.common so
these packages build the way they were intended to.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/cal3d-examples/Makefile | 6 | ||||
| -rw-r--r-- | graphics/cal3d/Makefile.common | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile index 5c220914dce..0fde6361e3e 100644 --- a/graphics/cal3d-examples/Makefile +++ b/graphics/cal3d-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/02/10 09:15:39 garbled Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/11 01:32:06 garbled Exp $ # PKGNAME= cal3d-examples-${CAL3D_VERSION} @@ -10,6 +10,7 @@ DISTFILES= TheCallyDemo-0.9.1b.zip \ COMMENT= Tools and demos for cal3d library +USE_X11= YES USE_BUILDLINK3= yes CONFIGURE_ARGS+= --with-cal3d=${PREFIX} CONFIGURE_ARGS+= --with-glut=${PREFIX} @@ -17,7 +18,8 @@ CONFIGURE_DIRS= ${WRKSRC}/examples/cally \ ${WRKSRC}/examples/miniviewer_gl \ ${WRKSRC}/tools/converter CFLAGS+= -DCAL3D_DATADIR='\"${DATADIR}/\"' -LIBS+= -lm -lX11 -lXi -lGL -lGLU -lXmu +LDFLAGS+= -L${X11BASE}/lib +LIBS+= -lm -lGL -lX11 -lGLU -lXi -lXmu BUILD_DIRS= ${WRKSRC}/examples/cally \ ${WRKSRC}/examples/miniviewer_gl \ ${WRKSRC}/tools/converter diff --git a/graphics/cal3d/Makefile.common b/graphics/cal3d/Makefile.common index c9b958cf12e..c065cfb0461 100644 --- a/graphics/cal3d/Makefile.common +++ b/graphics/cal3d/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2004/02/10 09:14:34 garbled Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/02/11 01:32:06 garbled Exp $ # DISTNAME= cal3d-${CAL3D_VERSION} @@ -16,7 +16,7 @@ USE_BUILDLINK3= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes AUTOMAKE_REQD= 1.8 -AUTOMAKE_OVERRIDE= NO +#AUTOMAKE_OVERRIDE= NO LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../mk/autoconf.mk" |