diff options
| author | jlam <jlam> | 2001-07-20 01:54:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-20 01:54:51 +0000 |
| commit | 7ebd2603f16501741c4242435382ae18a28bcb7f (patch) | |
| tree | dae0240406309a978c806a7f1e4b5be62fbd62bf /x11/wxGTK | |
| parent | c24277e4ecdbeb13be45cfd9a5fd021bdab1f0af (diff) | |
| download | pkgsrc-7ebd2603f16501741c4242435382ae18a28bcb7f.tar.gz | |
Mechanical changes to buildlink.mk files to use EVAL_PREFIX to set
BUILDLINK_PREFIX.<pkgname>. This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed. Idea by Alistair Crooks <agc@pkgsrc.org>.
Diffstat (limited to 'x11/wxGTK')
| -rw-r--r-- | x11/wxGTK/buildlink.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk index 6508670d20a..9ddb190297f 100644 --- a/x11/wxGTK/buildlink.mk +++ b/x11/wxGTK/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:34:01 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:56 jlam Exp $ # # This Makefile fragment is included by packages that use wxGTK. # @@ -20,18 +20,18 @@ WXGTK_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.wxGTK?= wxGTK>=2.2.2 DEPENDS+= ${BUILDLINK_DEPENDS.wxGTK}:../../x11/wxGTK -BUILDLINK_PREFIX.wxGTK= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.wxGTK=wxGTK BUILDLINK_FILES.wxGTK= include/wx/* BUILDLINK_FILES.wxGTK+= include/wx/*/* BUILDLINK_FILES.wxGTK+= lib/wx/include/wx/gtk/* BUILDLINK_FILES.wxGTK+= lib/libwx_gtk.* REPLACE_BUILDLINK_SED+= \ - -e "s|-I${BUILDLINK_DIR}/\(include/wx/\)|${X11PREFIX}/\1|g" \ - -e "s|-I${BUILDLINK_DIR}/\(lib/wx/include/\)|${X11PREFIX}/\1|g" + -e "s|-I${BUILDLINK_DIR}/\(include/wx/\)|${BUILDLINK_PREFIX.wxGTK}/\1|g" \ + -e "s|-I${BUILDLINK_DIR}/\(lib/wx/include/\)|${BUILDLINK_PREFIX.wxGTK}/\1|g" BUILDLINK_CONFIG_WRAPPER_SED+= \ - -e "s|-I${X11PREFIX}/\(include/wx/\)|-I${BUILDLINK_DIR}/\1|g" \ - -e "s|-I${X11PREFIX}/\(lib/wx/include/\)|-I${BUILDLINK_DIR}/\1|g" + -e "s|-I${BUILDLINK_PREFIX.wxGTK}/\(include/wx/\)|-I${BUILDLINK_DIR}/\1|g" \ + -e "s|-I${BUILDLINK_PREFIX.wxGTK}/\(lib/wx/include/\)|-I${BUILDLINK_DIR}/\1|g" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" @@ -43,8 +43,8 @@ BUILDLINK_TARGETS.wxGTK+= wxGTK-1-buildlink-config-wrapper BUILDLINK_TARGETS.wxGTK+= wxGTK-2-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.wxGTK} -BUILDLINK_CONFIG.wxGTK-1= ${X11PREFIX}/bin/wx-config -BUILDLINK_CONFIG.wxGTK-2= ${X11PREFIX}/bin/wxgtk-config +BUILDLINK_CONFIG.wxGTK-1= ${BUILDLINK_PREFIX.wxGTK}/bin/wx-config +BUILDLINK_CONFIG.wxGTK-2= ${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config BUILDLINK_CONFIG_WRAPPER.wxGTK-1= ${BUILDLINK_DIR}/bin/wx-config BUILDLINK_CONFIG_WRAPPER.wxGTK-2= ${BUILDLINK_DIR}/bin/wxgtk-config |