summaryrefslogtreecommitdiff
path: root/misc/openoffice
diff options
context:
space:
mode:
authorjlam <jlam>2003-03-14 19:37:30 +0000
committerjlam <jlam>2003-03-14 19:37:30 +0000
commitf69d0aee59b843edb712e3c7201d67c1860a9902 (patch)
tree4ee2e06249d68477cf3fb68be1f095453bcec90d /misc/openoffice
parent2045c3a17f778f4291f00ac8495b025fac1eb26c (diff)
downloadpkgsrc-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 'misc/openoffice')
-rw-r--r--misc/openoffice/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index b2c255d7584..d6bc88d5e3f 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/01/22 22:46:34 rh Exp $
+# $NetBSD: Makefile,v 1.34 2003/03/14 19:37:51 jlam Exp $
DISTNAME= openoffice-0.0.0.641
PKGREVISION= 1
@@ -36,7 +36,7 @@ CXX= ${GCCPREFIX}/bin/c++
CPP= ${GCCPREFIX}/bin/cpp
F77= ${GCCPREFIX}/bin/g77
PKG_FC= ${GCCPREFIX}/bin/g77
-LDFLAGS+= -R${GCCPREFIX}/lib
+LDFLAGS+= ${RPATH_FLAG}${GCCPREFIX}/lib
.endif
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison