diff options
author | dmcmahill <dmcmahill> | 2002-03-19 00:37:38 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2002-03-19 00:37:38 +0000 |
commit | dd6364fcd503d98436ea28dba0d84a009fd1a8c5 (patch) | |
tree | 46d2be9903e6464bfa97383df148e933d40f24ec /devel/glib | |
parent | 2fb16478276aa606c8e2387f353dcddd6b2f2591 (diff) | |
download | pkgsrc-dd6364fcd503d98436ea28dba0d84a009fd1a8c5.tar.gz |
don't always @dirrm include/glib since glib2 headers might be in there too.
also only buildlink the headers associated with this version of glib instead
of all versions. These 2 changes are in preparation for glib2.
Diffstat (limited to 'devel/glib')
-rw-r--r-- | devel/glib/PLIST | 4 | ||||
-rw-r--r-- | devel/glib/buildlink.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/devel/glib/PLIST b/devel/glib/PLIST index 983d0e9611a..e8686a8f827 100644 --- a/devel/glib/PLIST +++ b/devel/glib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:11 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/03/19 00:37:38 dmcmahill Exp $ bin/glib-config include/glib/glib-1.2/glib.h include/glib/glib-1.2/gmodule.h @@ -29,4 +29,4 @@ share/aclocal/glib.m4 @dirrm lib/glib/include @dirrm lib/glib @dirrm include/glib/glib-1.2 -@dirrm include/glib +@unexec ${RMDIR} %D/include/glib 2>/dev/null || true diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk index 702e7ab932f..769a76c347a 100644 --- a/devel/glib/buildlink.mk +++ b/devel/glib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.14 2002/03/18 15:48:19 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.15 2002/03/19 00:37:38 dmcmahill Exp $ # # This Makefile fragment is included by packages that use glib. # @@ -22,7 +22,7 @@ DEPENDS+= ${BUILDLINK_DEPENDS.glib}:../../devel/glib EVAL_PREFIX+= BUILDLINK_PREFIX.glib=glib BUILDLINK_PREFIX.glib_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.glib= include/glib/*/* +BUILDLINK_FILES.glib= include/glib/glib-1.2/* BUILDLINK_FILES.glib+= include/glib/* BUILDLINK_FILES.glib+= lib/glib/*/* BUILDLINK_FILES.glib+= lib/libglib.* |