From 34fb20b43dabe6fbee6a44fedb5786fcbab1293f Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 20 Aug 2010 15:02:24 +0000 Subject: [PATCH] use scripts from bin --- Makefile | 4 ++-- infrastructure/mk/pkgpath.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 83c73ceba12..f3cc7c41a85 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.63 2010/04/20 10:03:36 espie Exp $ +# $OpenBSD: Makefile,v 1.64 2010/08/20 15:02:24 espie Exp $ # $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $ # @@ -13,7 +13,7 @@ DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database .elif defined(key) || defined(name) || defined(category) || defined(author) # set up subdirs from the index, assume it's up-to-date -_CMD = perl ${.CURDIR}/infrastructure/build/index-retrieve index='${.CURDIR}/INDEX' +_CMD = perl ${.CURDIR}/infrastructure/bin/retrieve-index index='${.CURDIR}/INDEX' . if defined(key) _CMD += key='${key}' . endif diff --git a/infrastructure/mk/pkgpath.mk b/infrastructure/mk/pkgpath.mk index 2b4bdc3021c..4c2c28c8881 100644 --- a/infrastructure/mk/pkgpath.mk +++ b/infrastructure/mk/pkgpath.mk @@ -1,4 +1,4 @@ -# $OpenBSD: pkgpath.mk,v 1.27 2010/07/06 12:09:55 espie Exp $ +# $OpenBSD: pkgpath.mk,v 1.28 2010/08/20 15:02:24 espie Exp $ # ex:ts=4 sw=4 filetype=make: # pkgpath.mk - 2003 Marc Espie # This file is in the public domain. @@ -13,7 +13,7 @@ DANGEROUS ?= No .if !defined(PKGPATH) PKGPATH != PORTSDIR_PATH=${PORTSDIR_PATH} \ - perl ${PORTSDIR}/infrastructure/mk/getpkgpath ${.CURDIR} + perl ${PORTSDIR}/infrastructure/bin/getpkgpath ${.CURDIR} . if empty(PKGPATH) ERRORS += "Fatal: can't figure out PKGPATH" PKGPATH =${.CURDIR}