diff options
| author | fredb <fredb@pkgsrc.org> | 2002-04-19 16:53:41 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2002-04-19 16:53:41 +0000 |
| commit | 0c650c171e99a14fb7403e24f5b6898177a96f75 (patch) | |
| tree | b0b2cc67e83892354cc92a7f575149a1837f8d55 /print | |
| parent | 60715496a9ed3e9d9de1152d4a251779bb47d846 (diff) | |
| download | pkgsrc-0c650c171e99a14fb7403e24f5b6898177a96f75.tar.gz | |
Use the EVAL_PREFIX macro to grok the location of "forms.h", as suggested
by agc. For the "forms", "jpeg", and "Xpm" shared libraries, we have to
cast a wider net, so partially revert last commit. For that, "X11BASE" is
correct, as we already search "LOCALBASE" by virtue of ${LDFLAGS} set in
bsd.pkg.mk. This should fix PR pkg/16308.
Diffstat (limited to 'print')
| -rw-r--r-- | print/lyx/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 4c05d8501e5..0a21fa45fba 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2002/04/18 23:55:26 fredb Exp $ +# $NetBSD: Makefile,v 1.44 2002/04/19 16:53:41 fredb Exp $ # FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp # @@ -22,10 +22,11 @@ DEPENDS+= xforms>=0.9999:../../x11/xforms USE_PERL5= YES USE_XPM= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-extra-lib="${X11PREFIX}/lib" \ - --with-extra-inc="${X11PREFIX}/include ${X11PREFIX}/include/X11" +EVAL_PREFIX+= XFORMSDIR=xforms +CONFIGURE_ARGS+= --with-extra-lib="${X11BASE}/lib" \ + --with-extra-inc="${XFORMSDIR}/include/X11" -LDFLAGS+= -L${X11PREFIX}/lib -Wl,-R${X11PREFIX}/lib +LDFLAGS+= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib post-install: ${CHMOD} +x ${PREFIX}/share/lyx/configure |