diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-14 02:09:38 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-14 02:09:38 +0000 |
| commit | baa963cd7c3f6dfe676102d3d715188eb6e23a52 (patch) | |
| tree | e75e307146b1a9dfdef62819365fc7ff5dbf3ba4 /mk | |
| parent | 5b87a82011f79b78ac235eaaa2fde7579aa3368b (diff) | |
| download | pkgsrc-baa963cd7c3f6dfe676102d3d715188eb6e23a52.tar.gz | |
We only need to set USE_X11BASE, run install.man, and override the
compiler (CC/CXX) if we're actually using imake to generate Makefiles
for building and installing software. This fixes errors in various
KDE-3.x packages that use imake for other purposes.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 837ab426dbf..f8420d3ae03 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.16 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.17 2005/06/14 02:09:38 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -8,8 +8,6 @@ ############################################################################ .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} PLIST_SUBST+= IMAKE_MAN_DIR=${IMAKE_MAN_DIR} PLIST_SUBST+= IMAKE_LIBMAN_DIR=${IMAKE_LIBMAN_DIR} @@ -22,6 +20,11 @@ PLIST_SUBST+= IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX} PLIST_SUBST+= IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX} PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX} PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX} +.endif + +.if defined(USE_IMAKE) +USE_X11BASE?= implied +INSTALL_TARGET+= ${NO_INSTALL_MANPAGES:D:Uinstall.man} MAKE_FLAGS+= CC=${CC:Q} CXX=${CXX:Q} .endif |