libgpg-error-32: Install package to ${PREFIX}/emul/netbsd32

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Fri Jul 19 00:38:02 2019 +0200
Changeset:	521e8d5362046f7dd60eb66ad9cb1f342148ba74

Modified Files:
	libgpg-error-32/Makefile
	libgpg-error-32/buildlink3.mk

Log Message:
libgpg-error-32: Install package to ${PREFIX}/emul/netbsd32

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=521e8d5362046f7dd60eb66ad9cb1f342148ba74

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libgpg-error-32/Makefile      | 12 ++++++------
 libgpg-error-32/buildlink3.mk |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs:
diff --git a/libgpg-error-32/Makefile b/libgpg-error-32/Makefile
index e2838c9f16..3052791219 100644
--- a/libgpg-error-32/Makefile
+++ b/libgpg-error-32/Makefile
@@ -6,9 +6,6 @@ ABI=		32
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgpg-error/
 MASTER_SITES+=	ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
 EXTRACT_SUFX=	.tar.bz2
-LIBABISUFFIX?=          /32
-CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
-CFLAGS+=                -m32
 
 PKGNAME=	compat${ABI}_${DISTNAME}
 MAINTAINER=	minskim%NetBSD.org@localhost
@@ -20,6 +17,9 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+CFLAGS+=                -m32
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
+CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/emul/netbsd32/share/
 INFO_FILES=		yes
 TEST_TARGET=		check
 
@@ -35,11 +35,11 @@ CONFIGURE_ENV+=		CC_FOR_BUILD=${CC:Q}\ ${CFLAGS:M*:Q}
 LIBS+=	-lrt
 .endif
 
-remove non-libraries:
+remove non-libs-headers:
 	echo "Removing non-compat lib package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -or -type f -exec ${RM} {} +
+	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/emul -prune -or -type f -exec ${RM} {} +
 
-post-install: remove non-libraries
+post-install: remove non-libs-headers
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/libgpg-error-32/buildlink3.mk b/libgpg-error-32/buildlink3.mk
index fbe0d6c316..81fc66649a 100644
--- a/libgpg-error-32/buildlink3.mk
+++ b/libgpg-error-32/buildlink3.mk
@@ -7,9 +7,9 @@ compat32_LIBGPG_ERROR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.compat32_libgpg-error+=	compat32_libgpg-error>=0.6
 BUILDLINK_ABI_DEPENDS.compat32_libgpg-error+=	compat32_libgpg-error>=1.10nb1
-#BUILDLINK_PKGSRCDIR.libgpg-error?=	../../security/libgpg-error
 BUILDLINK_PKGSRCDIR.compat32_libgpg-error?=	../../wip/libgpg-error-32
-BUILDLINK_LIBDIRS.compat32_libgpg-error?=	lib/32
+BUILDLINK_LIBDIRS.compat32_libgpg-error?=	emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_libgpg-error?=	emul/netbsd32/include
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .endif # COMPAT32_LIBGPG_ERROR_BUILDLINK3_MK