diff options
| author | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-03-14 19:37:30 +0000 |
| commit | f69d0aee59b843edb712e3c7201d67c1860a9902 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /print | |
| parent | 2045c3a17f778f4291f00ac8495b025fac1eb26c (diff) | |
| download | pkgsrc-f69d0aee59b843edb712e3c7201d67c1860a9902.tar.gz | |
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
Diffstat (limited to 'print')
| -rw-r--r-- | print/ghostscript-gnu/Makefile.common | 4 | ||||
| -rw-r--r-- | print/ghostscript-nox11/Makefile.common | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common index 1ade7d60bf6..b60b3e18ec7 100644 --- a/print/ghostscript-gnu/Makefile.common +++ b/print/ghostscript-gnu/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2002/09/18 22:17:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.6 2003/03/14 19:37:54 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 7.05 @@ -51,7 +51,7 @@ MAKE_FLAGS+= XCFLAGS="${CFLAGS}" MAKE_FLAGS+= XLDFLAGS="${LDFLAGS}" .if ${OPSYS} == "SunOS" -LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,-R${ZOULARISBASE}/lib +LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib .endif REPLACE_PERL= lib/fixmswrd.pl diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index c16c507d223..98c56c2d349 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.42 2002/12/23 16:27:12 cjep Exp $ +# $NetBSD: Makefile.common,v 1.43 2003/03/14 19:37:54 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -138,7 +138,7 @@ ALL_TARGET= std . include "../../lang/gcc/buildlink2.mk" .endif .if defined(ZOULARISBASE) -LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,-R${ZOULARISBASE}/lib +LDFLAGS+= -L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib .endif .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4") @@ -155,7 +155,7 @@ MAKE_FLAGS+= GS_DISPLAY_DEVICE="${GS_DISPLAY_DEVICE}" MAKE_FLAGS+= XINCLUDE= XLIBDIRS= XLIBS="${XLIBS}" .if ${OPSYS} == "SunOS" -LDFLAGS+= -L${LOCALBASE}/bsd/lib -Wl,-R${LOCALBASE}/bsd/lib +LDFLAGS+= -L${LOCALBASE}/bsd/lib -Wl,${RPATH_FLAG}${LOCALBASE}/bsd/lib .endif # Define whether this platform has floating point hardware: |