pkgsrc-WIP-changes archive

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

fnaify: add some fixes I forgot to commit



Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Sat Jan 23 19:45:37 2021 +0200
Changeset:	63c72dcbd472aad11a10d0312ef42b31b9d75fc5

Modified Files:
	fnaify/Makefile

Log Message:
fnaify: add some fixes I forgot to commit

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

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

diffstat:
 fnaify/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diffs:
diff --git a/fnaify/Makefile b/fnaify/Makefile
index 122dfcd089..223decbf17 100644
--- a/fnaify/Makefile
+++ b/fnaify/Makefile
@@ -22,12 +22,17 @@ INSTALLATION_DIRS+=	${PKGMANDIR}/man1 bin share/fnaify
 
 REPLACE_BASH+=			fnaify
 
+.include "../../mk/bsd.prefs.mk"
+
 SUBST_CLASSES+=			pkgsrc-paths
 SUBST_STAGE.pkgsrc-paths=	pre-configure
 SUBST_FILES.pkgsrc-paths+=	fnaify
-SUBST_SED.pkgsrc-paths=		-e s,depdir.*,depdir=${PREFIX}/lib:${X11BASE}/lib,
-SUBST_SED.pkgsrc-paths=		-e s,fnadir.*,fnadir=${PREFIX}/share/FNA/,
-SUBST_SED.pkgsrc-paths=		-e s,/usr/local/,${PREFIX},
+SUBST_SED.pkgsrc-paths=		-e 's,^depdir.*,depdir=${PREFIX}/lib:${X11BASE}/lib,'
+SUBST_SED.pkgsrc-paths+=	-e 's,^fnadir.*,fnadir=${PREFIX}/share/FNA/,'
+SUBST_SED.pkgsrc-paths+=	-e s,/usr/local/,${PREFIX},
+.if ${OPSYS} == "NetBSD"
+SUBST_SED.pkgsrc-paths+=	-e s,ld.so,ld.elf_so,
+.endif
 
 
 .include "../../wip/fna/buildlink3.mk"


Home | Main Index | Thread Index | Old Index