diff options
| author | rillig <rillig> | 2008-01-04 01:46:24 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2008-01-04 01:46:24 +0000 |
| commit | b37ccd21553fccf7042ed7af80646be3f26b4d6b (patch) | |
| tree | 09fab4af7837547a826b3008a949a7856dd3f7b8 /mk/configure/configure.mk | |
| parent | cab7723f76fefa3e378af0675370ca3086b20890 (diff) | |
| download | pkgsrc-b37ccd21553fccf7042ed7af80646be3f26b4d6b.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/configure.mk')
| -rw-r--r-- | mk/configure/configure.mk | 18 |
1 files changed, 9 insertions, 9 deletions
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 ###################################################################### |