pkgsrc-WIP-changes archive

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

samtools,bcftools: Use ${TOOLS_PATH.bash} in test scripts



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Thu Jul 23 13:35:37 2020 -0500
Changeset:	1cf00c18a5a2e2460c1d582652dd13cd56cd9751

Modified Files:
	bcftools/Makefile
	samtools/Makefile

Log Message:
samtools,bcftools: Use ${TOOLS_PATH.bash} in test scripts

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

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

diffstat:
 bcftools/Makefile | 4 ++--
 samtools/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/bcftools/Makefile b/bcftools/Makefile
index 95056d3168..ccc6966665 100644
--- a/bcftools/Makefile
+++ b/bcftools/Makefile
@@ -21,8 +21,8 @@ SUBST_FILES.version=	configure.ac
 
 SUBST_CLASSES+=		bash
 SUBST_STAGE.bash=	pre-configure
-SUBST_SED.bash+=	-e 's|/bin/bash|${PREFIX}/bin/bash|'
-SUBST_SED.bash+=	-e 's|\\/bin\\/bash|${PREFIX:S,/,\\\/,g}\\/bin\\/bash|'
+SUBST_SED.bash+=	-e 's|/bin/bash|${TOOLS_PATH.bash}|'
+SUBST_SED.bash+=	-e 's|\\/bin\\/bash|${TOOLS_PATH.bash:S,/,\\\/,g}|'
 SUBST_FILES.bash=	test/test.pl
 
 REPLACE_PERL+=		misc/*.pl
diff --git a/samtools/Makefile b/samtools/Makefile
index 72a54b47b7..7390f66689 100644
--- a/samtools/Makefile
+++ b/samtools/Makefile
@@ -21,8 +21,8 @@ SUBST_FILES.version+=	configure.ac
 
 SUBST_CLASSES+=		bash
 SUBST_STAGE.bash=	pre-configure
-SUBST_SED.bash+=	-e "s|'bash'|'${PREFIX}/bin/bash'|"
-SUBST_SED.bash+=	-e 's|\\/bin\\/bash|${PREFIX:S,/,\\\/,g}\\/bin\\/bash|'
+SUBST_SED.bash+=	-e "s|'bash'|'${TOOLS_PATH.bash}'|"
+SUBST_SED.bash+=	-e 's|\\/bin\\/bash|${TOOLS_PATH.bash:S,/,\\\/,g}|'
 SUBST_FILES.bash+=	test/test.pl
 
 REPLACE_PERL+=		misc/*.pl


Home | Main Index | Thread Index | Old Index