diff options
| author | schwarz <schwarz> | 2005-10-16 19:38:05 +0000 |
|---|---|---|
| committer | schwarz <schwarz> | 2005-10-16 19:38:05 +0000 |
| commit | 825b620180249ac496b1c50560dd02427ef52a08 (patch) | |
| tree | 48d708d58a5e6ddc148747f70bb4a68cdcefe215 /mk | |
| parent | 4623cb73ed61f7bd8ffa955fd92329d67ad93388 (diff) | |
| download | pkgsrc-825b620180249ac496b1c50560dd02427ef52a08.tar.gz | |
modification to increase imake handling flexibility for IRIX (in particular
with respect to IRIX 5).
Changes approved by jschauma and recht.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/platform/IRIX.mk | 21 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 7 |
2 files changed, 17 insertions, 11 deletions
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index 645f4cb516a..2828ecc21d8 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,8 +1,11 @@ -# $NetBSD: IRIX.mk,v 1.16 2005/08/02 00:23:31 reed Exp $ +# $NetBSD: IRIX.mk,v 1.17 2005/10/16 19:38:05 schwarz Exp $ # # Variable definitions for the IRIX operating system. ECHO_N?= ${ECHO} -n +.if exists(/usr/bin/X11/imake) +IMAKE?= /usr/bin/X11/imake # IRIX 5.3 location +.endif IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake IMAKEOPTS+= -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE} IMAKEOPTS+= -DManUsr=${PREFIX} @@ -27,14 +30,14 @@ ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` ULIMIT_CMD_memorysize?= ulimit -v `ulimit -H -v` # imake installs manpages in weird places -IMAKE_MAN_SOURCE_PATH= catman/u_man/cat -IMAKE_MAN_SUFFIX= 1 -IMAKE_LIBMAN_SUFFIX= 3 -IMAKE_FILEMAN_SUFFIX= 5 -IMAKE_MAN_DIR= ${IMAKE_MAN_SOURCE_PATH}1/X11 -IMAKE_LIBMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}3/X11 -IMAKE_FILEMAN_DIR= ${IMAKE_MAN_SOURCE_PATH}5/X11 -IMAKE_MANNEWSUFFIX= z +IMAKE_MAN_SOURCE_PATH?= catman/u_man/cat +IMAKE_MAN_SUFFIX?= 1 +IMAKE_LIBMAN_SUFFIX?= 3 +IMAKE_FILEMAN_SUFFIX?= 5 +IMAKE_MAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}1/X11 +IMAKE_LIBMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}3/X11 +IMAKE_FILEMAN_DIR?= ${IMAKE_MAN_SOURCE_PATH}5/X11 +IMAKE_MANNEWSUFFIX?= z _DO_SHLIB_CHECKS= yes # fixup PLIST for shared libs .if exists(/usr/include/netinet6) diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 53959302bd2..34d0e78ba29 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.128 2005/10/12 16:28:29 jlam Exp $ +# $NetBSD: replace.mk,v 1.129 2005/10/16 19:38:05 schwarz Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -691,7 +691,10 @@ TOOLS_PATH.imake= ${TOOLS_PREFIX.imake}/${X11ROOT_PREFIX}/bin/imake TOOLS_DEPENDS.imake?= xorg-imake>=6.8:../../x11/xorg-imake TOOLS_FIND_PREFIX+= TOOLS_PREFIX.imake=xorg-imake TOOLS_PATH.imake= ${TOOLS_PREFIX.imake}/${X11ROOT_PREFIX}/bin/imake -. else # !empty(X11_TYPE:Mnative) +# !empty(X11_TYPE:Mnative) +. elif defined(IMAKE) +TOOLS_PATH.imake= ${IMAKE} +. else TOOLS_PATH.imake= ${X11BASE}/bin/imake . endif . endif |