diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-18 20:49:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-18 20:49:00 +0000 |
| commit | 8f394194915e650f7066d8fb0d5567688c91553a (patch) | |
| tree | df5a8812c3460da4de92cdac4be27d685b475a09 /x11 | |
| parent | 5adffe4185151c2cc474c10e7e858059ff8a2e75 (diff) | |
| download | pkgsrc-8f394194915e650f7066d8fb0d5567688c91553a.tar.gz | |
Regularize fixes to config scripts to use the same code.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome-libs/Makefile | 7 | ||||
| -rw-r--r-- | x11/gtk/Makefile | 19 |
2 files changed, 15 insertions, 11 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index ab744fccdb8..d09eb1a4773 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2001/06/16 20:05:10 jlam Exp $ +# $NetBSD: Makefile,v 1.63 2001/06/18 20:49:01 jlam Exp $ DISTNAME= gnome-libs-1.2.13 CATEGORIES= x11 gnome @@ -61,10 +61,11 @@ pre-build: cd ${WRKSRC}/support && \ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} gnomesupport.h -# Fix gnomeConf.sh, gnome-config by removing buildlink directory references. +# Fix config scripts by removing buildlink directory references. post-build: @cd ${WRKSRC}; \ - for file in gnomeConf.sh gnome-config; do \ + config_scripts="gnomeConf.sh gnome-config"; \ + for file in $${config_scripts}; do \ ${MV} -f $${file} $${file}.fixme; \ ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \ -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \ diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 0d82c6e4dfc..50450ab1208 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2001/06/16 19:50:58 jlam Exp $ +# $NetBSD: Makefile,v 1.60 2001/06/18 20:49:02 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -38,15 +38,18 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -# Fix gtk-config by removing buildlink directory references. +# Fix config scripts by removing buildlink directory references. post-build: @cd ${WRKSRC}; \ - ${MV} -f gtk-config gtk-config.fixme; \ - ${SED} -e "/^glib/s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \ - -e "/^glib/s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \ - gtk-config.fixme > gtk-config; \ - ${RM} -f gtk-config.fixme; \ - ${CHMOD} +x gtk-config + config_scripts="gtk-config"; \ + for file in $${config_scripts}; do \ + ${MV} -f $${file} $${file}.fixme; \ + ${SED} -e "s|-I${BUILDLINK_DIR}/|-I${LOCALBASE}/|g" \ + -e "s|-L${BUILDLINK_DIR}/|-L${LOCALBASE}/|g" \ + $${file}.fixme > $${file}; \ + ${RM} -f $${file}.fixme; \ + ${CHMOD} +x $${file}; \ + done post-install: ${TEST} ${PREFIX} = ${LOCALBASE} || \ |