diff options
author | jlam <jlam> | 2001-10-03 20:56:40 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-10-03 20:56:40 +0000 |
commit | 2e51be22abf513f3fde4fcd8059c241d89c82e5e (patch) | |
tree | 6ea8cf3bb761f4715c28ac12c51846bc482df7b7 /x11 | |
parent | fb49692d888d5067424800fff566eeb9b8456603 (diff) | |
download | pkgsrc-2e51be22abf513f3fde4fcd8059c241d89c82e5e.tar.gz |
Substitute the real config script for the config wrapper script in
installed files. We don't want buildlink references to escape into the
install directory.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gnome-libs/buildlink.mk | 7 | ||||
-rw-r--r-- | x11/gtk/buildlink.mk | 4 | ||||
-rw-r--r-- | x11/kdelibs2/buildlink.mk | 6 | ||||
-rw-r--r-- | x11/wxGTK/buildlink.mk | 7 |
4 files changed, 20 insertions, 4 deletions
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk index c08dfe0419b..104e11c04e8 100644 --- a/x11/gnome-libs/buildlink.mk +++ b/x11/gnome-libs/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.11 2001/08/26 01:44:33 mjl Exp $ +# $NetBSD: buildlink.mk,v 1.12 2001/10/03 20:56:54 jlam Exp $ # # This Makefile fragment is included by packages that use gnome-libs. # @@ -59,8 +59,13 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gnome-libs} BUILDLINK_CONFIG.gnome-libs= ${BUILDLINK_PREFIX.gnome-libs}/bin/gnome-config BUILDLINK_CONFIG_WRAPPER.gnome-libs= ${BUILDLINK_DIR}/bin/gnome-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.gnome-libs}|${BUILDLINK_CONFIG.gnome-libs}|g" + BUILDLINK_CONFIG.libart= ${BUILDLINK_PREFIX.gnome-libs}/bin/libart-config BUILDLINK_CONFIG_WRAPPER.libart= ${BUILDLINK_DIR}/bin/libart-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.libart}|${BUILDLINK_CONFIG.libart}|g" .if defined(USE_CONFIG_WRAPPER) GNOME_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gnome-libs} diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk index 3ecdcd97243..d3b883ffd7a 100644 --- a/x11/gtk/buildlink.mk +++ b/x11/gtk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:16 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.11 2001/10/03 20:56:55 jlam Exp $ # # This Makefile fragment is included by packages that use gtk. # @@ -42,6 +42,8 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gtk} BUILDLINK_CONFIG.gtk= ${BUILDLINK_PREFIX.gtk}/bin/gtk-config BUILDLINK_CONFIG_WRAPPER.gtk= ${BUILDLINK_DIR}/bin/gtk-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.gtk}|${BUILDLINK_CONFIG.gtk}|g" .if defined(USE_CONFIG_WRAPPER) GTK_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gtk} diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk index 7fbe88633bc..692a8cad46f 100644 --- a/x11/kdelibs2/buildlink.mk +++ b/x11/kdelibs2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2001/09/21 20:16:19 jdolecek Exp $ +# $NetBSD: buildlink.mk,v 1.10 2001/10/03 20:56:55 jlam Exp $ # # This Makefile fragment is included by packages that use kdelibs2. # @@ -46,9 +46,13 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.kdelibs2} BUILDLINK_CONFIG.kdelibs2= ${BUILDLINK_PREFIX.kdelibs2}/bin/kde-config BUILDLINK_CONFIG_WRAPPER.kdelibs2= ${BUILDLINK_DIR}/bin/kde-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.kdelibs2}|${BUILDLINK_CONFIG.kdelibs2}|g" BUILDLINK_CONFIG.kdelibs2-artsc= ${BUILDLINK_PREFIX.kdelibs2}/bin/artsc-config BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc= ${BUILDLINK_DIR}/bin/artsc-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc}|${BUILDLINK_CONFIG.kdelibs2-artsc}|g" .if defined(USE_CONFIG_WRAPPER) ARTSCCONFIG?= ${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc} diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk index c6a063451d2..57b8f4cbc26 100644 --- a/x11/wxGTK/buildlink.mk +++ b/x11/wxGTK/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:18 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/10/03 20:56:55 jlam Exp $ # # This Makefile fragment is included by packages that use wxGTK. # @@ -46,8 +46,13 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.wxGTK} BUILDLINK_CONFIG.wxGTK-1= ${BUILDLINK_PREFIX.wxGTK}/bin/wx-config BUILDLINK_CONFIG.wxGTK-2= ${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config +REPLACE_BUILDLINK_SED+= \ + -e "s|${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}|${BUILDLINK_CONFIG.wxGTK-1}|g" + 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|${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}|${BUILDLINK_CONFIG.wxGTK-2}|g" .if defined(USE_CONFIG_WRAPPER) WX_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.wxGTK-1} |