Make USE_TOOLS+=imake imply USE_X11BASE=yes, along with the other
variable definitions that apply when USE_IMAKE is defined.
This commit is contained in:
parent
f793cad898
commit
39cbd126b0
2 changed files with 3 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.12 2005/05/17 22:20:15 jlam Exp $
|
||||
# $NetBSD: Makefile.common,v 1.13 2005/05/17 22:22:52 jlam Exp $
|
||||
#
|
||||
# Canna common makefile.
|
||||
#
|
||||
|
@ -19,7 +19,6 @@ PATCHDIR= ${.CURDIR}/../canna/patches
|
|||
.include "../canna/Makefile.version"
|
||||
|
||||
USE_TOOLS+= imake
|
||||
USE_X11BASE= yes
|
||||
CANNA_SPOOL= ${DESTDIR}/var/spool/canna
|
||||
CANNA_MODE= 0755
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.pkg.use.mk,v 1.10 2005/05/12 21:03:46 jlam Exp $
|
||||
# $NetBSD: bsd.pkg.use.mk,v 1.11 2005/05/17 22:22:52 jlam Exp $
|
||||
#
|
||||
# Turn USE_* macros into proper depedency logic. Included near the top of
|
||||
# bsd.pkg.mk, after bsd.prefs.mk.
|
||||
|
@ -7,7 +7,7 @@
|
|||
# ${PREFIX} selection
|
||||
############################################################################
|
||||
|
||||
.if defined(USE_IMAKE)
|
||||
.if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)
|
||||
INSTALL_TARGET+= ${NO_INSTALL_MANPAGES:D:Uinstall.man}
|
||||
USE_X11BASE?= implied
|
||||
PLIST_SUBST+= IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}
|
||||
|
|
Loading…
Reference in a new issue