pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
auto-admin: Fix default prefix used by pkgsrc scripts
Module Name: pkgsrc-wip
Committed By: Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By: outpaddling
Date: Thu Sep 7 11:19:22 2017 -0500
Changeset: 93193cf51069a3c9ac64fde4cf7376ffea2c5353
Modified Files:
auto-admin/Makefile
Log Message:
auto-admin: Fix default prefix used by pkgsrc scripts
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=93193cf51069a3c9ac64fde4cf7376ffea2c5353
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
auto-admin/Makefile | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diffs:
diff --git a/auto-admin/Makefile b/auto-admin/Makefile
index e85734959b..d5f7a3a28d 100644
--- a/auto-admin/Makefile
+++ b/auto-admin/Makefile
@@ -17,11 +17,17 @@ REPLACE_SH= */Scripts/*
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-patch
-SUBST_FILES.prefix+= ${WRKSRC}/Common/Scripts/auto-clean-pkgsrc
+SUBST_FILES.prefix+= ${WRKSRC}/Common/Scripts/auto-denyhosts-setup
SUBST_FILES.prefix+= ${WRKSRC}/Common/Scripts/auto-denyhosts-remove-ip
-SUBST_FILES.prefix+= ${WRKSRC}/Common/Scripts/auto-print-make-variable
+SUBST_FILES.prefix+= ${WRKSRC}/Common/Scripts/auto-pkgsrc-add-license
SUBST_SED.prefix+= -e "s|/usr/local|${PREFIX}|g"
-SUBST_SED.prefix+= -e "s|/usr/pkgsrc|${PREFIX}|g"
+SUBST_SED.prefix+= -e "s|/usr/pkg|${PREFIX}|g"
+
+SUBST_CLASSES+= pkgsrc
+SUBST_STAGE.pkgsrc= post-patch
+SUBST_SED.pkgsrc= -e 's|/usr/pkgsrc|${BUILD_DIR}/../..|g'
+SUBST_FILES.pkgsrc+= ${WRKSRC}/Common/Scripts/auto-clean-pkgsrc
+SUBST_FILES.pkgsrc+= ${WRKSRC}/Common/Scripts/auto-print-make-variable
INSTALLATION_DIRS= sbin
Home |
Main Index |
Thread Index |
Old Index