Skip to content

Commit

Permalink
better: define PSEUDO_FLAVOR as something to add to the fullpkgpath
Browse files Browse the repository at this point in the history
  • Loading branch information
marcespie committed Sep 10, 2011
1 parent d700a41 commit 8125db8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions infrastructure/mk/bsd.port.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1103 2011/09/10 08:05:12 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1104 2011/09/10 08:20:56 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 $
#
Expand Down Expand Up @@ -113,7 +113,7 @@ _ALL_VARIABLES += HOMEPAGE DISTNAME \
REGRESS_IS_INTERACTIVE \
PERMIT_DISTFILES_CDROM PERMIT_DISTFILES_FTP \
CONFIGURE_STYLE USE_LIBTOOL SEPARATE_BUILD \
SHARED_LIBS TARGETS FLAVOR \
SHARED_LIBS TARGETS PSEUDO_FLAVOR \
MAINTAINER AUTOCONF_VERSION AUTOMAKE_VERSION CONFIGURE_ARGS
_ALL_VARIABLES_PER_ARCH += BROKEN
# and stuff needing to be MULTI_PACKAGE'd
Expand Down Expand Up @@ -517,6 +517,7 @@ BUILD_PKGPATH := ${PKGPATH}
_PKG_ARGS =
_README_DIR = ${LOCALBASE}/share/doc/pkg-readmes

PSEUDO_FLAVOR =
# (applies only to PLIST for now)
.if !empty(FLAVORS)
. for _i in ${FLAVORS:L}
Expand All @@ -528,6 +529,8 @@ BUILD_PKGPATH := ${BUILD_PKGPATH},${_i}
. if empty(PSEUDO_FLAVORS:L:M${_i})
FLAVOR_EXT := ${FLAVOR_EXT}-${_i}
BASE_PKGPATH := ${BASE_PKGPATH},${_i}
. else
PSEUDO_FLAVOR := ${PSEUDO_FLAVOR},${_i}
. endif
_PKG_ARGS += -D${_i}=1
. endif
Expand Down

0 comments on commit 8125db8

Please sign in to comment.