png-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:		Thu Jul 18 22:50:50 2019 +0200
Changeset:	1924a7f7a8015f7fe6f73a7d906051ab348ed910

Modified Files:
	png-32/Makefile
	png-32/buildlink3.mk

Log Message:
png-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=1924a7f7a8015f7fe6f73a7d906051ab348ed910

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

diffstat:
 png-32/Makefile      | 6 +-----
 png-32/buildlink3.mk | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs:
diff --git a/png-32/Makefile b/png-32/Makefile
index 471a09ebf6..cdd0c33a07 100644
--- a/png-32/Makefile
+++ b/png-32/Makefile
@@ -3,7 +3,6 @@
 DISTNAME=	libpng-1.6.37
 ABI?=		32
 PKGNAME=	compat${ABI}_${DISTNAME:S/lib//}
-LIBABISUFFIX?=	/32
 CATEGORIES=	graphics
 MASTER_SITES=	https://ftp-osl.osuosl.org/pub/libpng/src/archive/xz/libpng16/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=libpng/}
@@ -19,11 +18,8 @@ CFLAGS+=		-m32
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 # do not create libpng.la
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib${LIBABISUFFIX}
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
 CONFIGURE_ARGS+=	--disable-unversioned-links
-CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/${LIBABISUFFIX}
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/lib/${LIBABISUFFIX}
-GNU_CONFIGURE_MANDIR=	${PREFIX}/lib/${LIBABISUFFIX}
 # but do install png.h outside include/libpng$VERSION for now
 # until pkgsrc is fixed to use libpng-config or the pc file everywhere
 INSTALL_TARGET=		install install-header-links
diff --git a/png-32/buildlink3.mk b/png-32/buildlink3.mk
index b1f44f05c2..7bc05bd350 100644
--- a/png-32/buildlink3.mk
+++ b/png-32/buildlink3.mk
@@ -8,7 +8,8 @@ COMPAT32_PNG_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.compat32_png+=	compat32_png>=1.2.4
 BUILDLINK_ABI_DEPENDS.compat32_png+=	compat32_png>=1.6.0nb1
 BUILDLINK_PKGSRCDIR.compat32_png?=	../../wip/png-32
-BUILDLINK_LIBDIRS.compat32_png=		lib/32
+BUILDLINK_LIBDIRS.compat32_png=		emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_png=		emul/netbsd32/include
 
 # keep this in sync with the same code in Makefile
 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"