diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-20 01:54:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-20 01:54:51 +0000 |
| commit | dd30dabc8c342242d2f7de362ba8e4fbd55dc056 (patch) | |
| tree | dae0240406309a978c806a7f1e4b5be62fbd62bf /x11/gtk | |
| parent | f79b2df20a2446d953dd624071a51110e3323693 (diff) | |
| download | pkgsrc-dd30dabc8c342242d2f7de362ba8e4fbd55dc056.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/gtk')
| -rw-r--r-- | x11/gtk/buildlink.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk index 1b058ad6f84..3fc3bf09231 100644 --- a/x11/gtk/buildlink.mk +++ b/x11/gtk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/13 05:42:05 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:54 jlam Exp $ # # This Makefile fragment is included by packages that use gtk. # @@ -20,7 +20,7 @@ GTK_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.8 DEPENDS+= ${BUILDLINK_DEPENDS.gtk}:../../x11/gtk -BUILDLINK_PREFIX.gtk= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.gtk=gtk BUILDLINK_FILES.gtk= include/gdk/* BUILDLINK_FILES.gtk+= include/gtk/* BUILDLINK_FILES.gtk+= include/gtk-*/*/* @@ -28,9 +28,9 @@ BUILDLINK_FILES.gtk+= lib/libgdk.* BUILDLINK_FILES.gtk+= lib/libgtk.* REPLACE_BUILDLINK_SED+= \ - -e "s|-I${BUILDLINK_DIR}/\(include/gtk-[^/]*/\)|-I${X11PREFIX}/\1|g" + -e "s|-I${BUILDLINK_DIR}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_PREFIX.gtk}/\1|g" BUILDLINK_CONFIG_WRAPPER_SED+= \ - -e "s|-I${X11PREFIX}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_DIR}/\1|g" + -e "s|-I${BUILDLINK_PREFIX.gtk}/\(include/gtk-[^/]*/\)|-I${BUILDLINK_DIR}/\1|g" .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" @@ -39,7 +39,7 @@ BUILDLINK_TARGETS.gtk= gtk-buildlink BUILDLINK_TARGETS.gtk+= gtk-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gtk} -BUILDLINK_CONFIG.gtk= ${X11PREFIX}/bin/gtk-config +BUILDLINK_CONFIG.gtk= ${BUILDLINK_PREFIX.gtk}/bin/gtk-config BUILDLINK_CONFIG_WRAPPER.gtk= ${BUILDLINK_DIR}/bin/gtk-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) |