From a771eb7968c94f0addf4db20c476555536382e51 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 14 Mar 2003 19:37:30 +0000 Subject: (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. --- x11/gtk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'x11/gtk') diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index f7158c5b67a..dec0a112451 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2002/12/19 13:09:37 grant Exp $ +# $NetBSD: Makefile,v 1.79 2003/03/14 19:38:05 jlam Exp $ DISTNAME= gtk+-1.2.10 PKGREVISION= 3 @@ -36,7 +36,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # The following ensures that `gtk-config --libs' includes the correct linker # flags for linking the X11 libs. # -X_LDFLAGS= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib +X_LDFLAGS= ${X11_LDFLAGS} GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} -- cgit v1.2.3