diff options
| author | rillig <rillig@pkgsrc.org> | 2008-01-04 01:46:24 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-01-04 01:46:24 +0000 |
| commit | d3624fdf106f006eafc46d8854c87a32596aeae2 (patch) | |
| tree | 09fab4af7837547a826b3008a949a7856dd3f7b8 /mk/configure | |
| parent | 47f1024dc0fadad85800419df80b284620762f56 (diff) | |
| download | pkgsrc-d3624fdf106f006eafc46d8854c87a32596aeae2.tar.gz | |
Made the .include directives simpler, since the directory of the
including file is always the first in the search path.
Diffstat (limited to 'mk/configure')
| -rw-r--r-- | mk/configure/bsd.configure.mk | 4 | ||||
| -rw-r--r-- | mk/configure/configure.mk | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index 0a6f6604dbc..0f34cd38f87 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.configure.mk,v 1.10 2007/03/07 01:27:28 rillig Exp $ +# $NetBSD: bsd.configure.mk,v 1.11 2008/01/04 01:46:26 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to configuring packages for building. @@ -21,7 +21,7 @@ _COOKIE.configure= ${WRKDIR}/.configure_done ### .PHONY: configure .if !defined(NO_CONFIGURE) -. include "${PKGSRCDIR}/mk/configure/configure.mk" +. include "configure.mk" .elif !target(configure) . if exists(${_COOKIE.configure}) configure: diff --git a/mk/configure/configure.mk b/mk/configure/configure.mk index 67d3b442ee1..71115545107 100644 --- a/mk/configure/configure.mk +++ b/mk/configure/configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: configure.mk,v 1.21 2007/12/12 01:00:40 markd Exp $ +# $NetBSD: configure.mk,v 1.22 2008/01/04 01:46:26 rillig Exp $ # # = Package-settable variables = # @@ -61,26 +61,26 @@ CMAKE_ARG_PATH?= . _BUILD_DEFS+= CONFIGURE_ENV CONFIGURE_ARGS CMAKE_ARGS .if defined(GNU_CONFIGURE) -. include "${PKGSRCDIR}/mk/configure/gnu-configure.mk" +. include "gnu-configure.mk" .endif .if defined(OVERRIDE_GNU_CONFIG_SCRIPTS) -. include "${PKGSRCDIR}/mk/configure/config-override.mk" +. include "config-override.mk" .endif .if defined(INSTALL_SH_OVERRIDE) && empty(INSTALL_SH_OVERRIDE:M[Nn][Oo]) -. include "${PKGSRCDIR}/mk/configure/install-sh-override.mk" +. include "install-sh-override.mk" .endif .if defined(USE_LIBTOOL) -. include "${PKGSRCDIR}/mk/configure/libtool-override.mk" +. include "libtool-override.mk" .endif .if defined(PKGCONFIG_OVERRIDE) -. include "${PKGSRCDIR}/mk/configure/pkg-config-override.mk" +. include "pkg-config-override.mk" .endif -.include "${PKGSRCDIR}/mk/configure/replace-interpreter.mk" +.include "replace-interpreter.mk" .if defined(USE_PKGLOCALEDIR) -. include "${PKGSRCDIR}/mk/configure/replace-localedir.mk" +. include "replace-localedir.mk" .endif .if defined(USE_CMAKE) -. include "${PKGSRCDIR}/mk/configure/cmake.mk" +. include "cmake.mk" .endif ###################################################################### |