diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-02 05:11:37 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-02 05:11:37 +0000 |
| commit | cf6936eb4f2ea8ff0385fd8daafa0c154d27d494 (patch) | |
| tree | 6663fa3405776f3c1b7fd1ec1c22dd2c144acae5 /x11 | |
| parent | 798c9b42c7018f39a0d7245e980a03129a754b19 (diff) | |
| download | pkgsrc-cf6936eb4f2ea8ff0385fd8daafa0c154d27d494.tar.gz | |
Make REPLACE_BUILDLINK_SED and BUILDLINK_CONFIG_WRAPPER_SED be opposites.
Also move these settings ahead of inclusion of other buildlink.mk files.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gtk/buildlink.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk index 3a8bc813354..5af7d6414b0 100644 --- a/x11/gtk/buildlink.mk +++ b/x11/gtk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:57:58 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:11:37 jlam Exp $ # # This Makefile fragment is included by packages that use gtk. # @@ -25,6 +25,11 @@ BUILDLINK_FILES.gtk= include/gtk-*/*/* BUILDLINK_FILES.gtk+= lib/libgdk.* BUILDLINK_FILES.gtk+= lib/libgtk.* +REPLACE_BUILDLINK_SED+= \ + -e "s|-I${BUILDLINK_DIR}/\(include/gtk-[^/]*/\)|-I${X11PREFIX}/\1|g" +BUILDLINK_CONFIG_WRAPPER_SED+= \ + -e "s|-I${X11PREFIX}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_DIR}/\1|g" + .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" @@ -35,15 +40,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gtk} BUILDLINK_CONFIG.gtk= ${X11PREFIX}/bin/gtk-config BUILDLINK_CONFIG_WRAPPER.gtk= ${BUILDLINK_DIR}/bin/gtk-config -BUILDLINK_CONFIG_WRAPPER_SED+= \ - -e "s|${X11PREFIX}/\(include/gtk-[^/]*/\)|${BUILDLINK_DIR}/\1|g" - .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) CONFIGURE_ENV+= GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}" .endif -REPLACE_BUILDLINK_SED+= -e "s|-I${BUILDLINK_DIR}/include/gtk-1\.2/|${X11PREFIX}/include/gtk-1.2|g" - pre-configure: ${BUILDLINK_TARGETS.gtk} gtk-buildlink: _BUILDLINK_USE gtk-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE |