pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wine64: Use appropriate mk macros



Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Fri Jul 12 19:06:22 2019 +0200
Changeset:	a690670f42a600b01f8261598344081c5ce7bc25

Modified Files:
	wine64/Makefile

Log Message:
wine64: Use appropriate mk macros

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

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

diffstat:
 wine64/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diffs:
diff --git a/wine64/Makefile b/wine64/Makefile
index ac58c6fc49..322e3bdfc5 100644
--- a/wine64/Makefile
+++ b/wine64/Makefile
@@ -13,14 +13,14 @@ LICENSE=		gnu-lgpl-v2.1
 ONLY_FOR_PLATFORM+=	*-*-x86_64
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-tests
-WINE32_ARGS+=		--x-libraries=/usr/pkg/emul/netbsd32/lib
+WINE32_ARGS+=		--x-libraries=${PREFIX}/emul/netbsd32/lib
 WINE32_ARGS+=		--with-wine64=${BUILD64}
 WINE32_ARGS+=		--libdir=${PREFIX}/lib/32
 WINE64_ARGS+=		--enable-win64
 WINE64_ARGS+=		--libdir=${PREFIX}/lib
 WINE32_ENV+=		CFLAGS+=-m32
-WINE32_ENV+=		X11_LDFLAGS+=-Wl,-rpath,/usr/pkg/emul/netbsd32/lib
-WINE32_ENV+=		X11_LDFLAGS+=-L/usr/pkg/emul/netbsd32/lib
+WINE32_ENV+=		X11_LDFLAGS+=${COMPILER_RPATH_FLAG}${PREFIX}/emul/netbsd32/lib
+WINE32_ENV+=		X11_LDFLAGS+=-L${PREFIX}/emul/netbsd32/lib
 WINE32_ENV+=		X11_LDFLAGS+=-lX11
 
 USE_LANGUAGES=		c c++


Home | Main Index | Thread Index | Old Index