diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-02 04:41:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-02 04:41:57 +0000 |
| commit | 54f7d41c3ffe1646bbb567c7d5e8294a4436c222 (patch) | |
| tree | 96e994083c7e8190caf7bb1a8d89ed75e3d33d96 /x11 | |
| parent | 44683f15f99989588bc7b7ce9af4c7694709d28d (diff) | |
| download | pkgsrc-54f7d41c3ffe1646bbb567c7d5e8294a4436c222.tar.gz | |
Move *_SED before inclusion of other buildlink.mk files to order sed
expression properly.
Diffstat (limited to 'x11')
| -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 473cbb0492e..50005f82195 100644 --- a/x11/wxGTK/buildlink.mk +++ b/x11/wxGTK/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/02 04:40:38 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/02 04:41:57 jlam Exp $ # # This Makefile fragment is included by packages that use wxGTK. # @@ -26,6 +26,13 @@ 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" +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" + .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" @@ -41,13 +48,6 @@ BUILDLINK_CONFIG.wxGTK-2= ${X11PREFIX}/bin/wxgtk-config BUILDLINK_CONFIG_WRAPPER.wxGTK-1= ${BUILDLINK_DIR}/bin/wx-config BUILDLINK_CONFIG_WRAPPER.wxGTK-2= ${BUILDLINK_DIR}/bin/wxgtk-config -REPLACE_BUILDLINK_SED+= \ - -e "s|-I${BUILDLINK_DIR}/\(include/wx/\)|${X11PREFIX}/\1|g" \ - -e "s|-I${BUILDLINK_DIR}/\(lib/wx/include/\)|${X11PREFIX}/\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" - .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) CONFIGURE_ENV+= WX_CONFIG="${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}" CONFIGURE_ENV+= WXGTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}" |