pass FULLSUBDIR around, to eventually allow dpb to distinguish between

empty and default stuff.
This commit is contained in:
espie 2010-10-18 08:32:21 +00:00
parent 969e1a7b46
commit 7eded3e86b
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1040 2010/10/02 10:25:21 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1041 2010/10/18 08:32:21 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -93,7 +93,7 @@ _PERLSCRIPT = perl ${PORTSDIR}/infrastructure/bin
# All variables relevant to the port's description
_ALL_VARIABLES = BUILD_DEPENDS IGNORE IS_INTERACTIVE \
SUBPACKAGE MULTI_PACKAGES
SUBPACKAGE MULTI_PACKAGES FULLSUBDIR
# and stuff needing to be MULTI_PACKAGE'd
_ALL_VARIABLES_INDEXED = FULLPKGNAME RUN_DEPENDS LIB_DEPENDS \
PKG_ARCH EPOCH REVISION

View File

@ -1,4 +1,4 @@
# $OpenBSD: pkgpath.mk,v 1.29 2010/08/20 23:11:07 espie Exp $
# $OpenBSD: pkgpath.mk,v 1.30 2010/10/18 08:32:21 espie Exp $
# ex:ts=4 sw=4 filetype=make:
# pkgpath.mk - 2003 Marc Espie
# This file is in the public domain.
@ -57,7 +57,7 @@ _flavor_fragment = \
*) \
dir=$$subdir;; \
esac; \
toset="PKGPATH=$$dir ARCH=${ARCH}"; \
toset="FULLSUBDIR=$$subdir PKGPATH=$$dir ARCH=${ARCH}"; \
case X$$multi in "X");; *) \
toset="$$toset SUBPACKAGE=\"$$multi\"";; \
esac; \