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

diff --git a/libgpg-error-32/Makefile b/libgpg-error-32/Makefile
index e2838c9f1661bc874d9ae0e918d515ca1ac1018a..305279121969b5534c45cb8142127d08bf4b4821 100644 (file)
--- 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
@@ -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 fbe0d6c316114d6b9332a21d6e36e4899f05a123..81fc66649a2e21bd205bc9b68fc4c2744701441c 100644 (file)
--- 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