diff options
| author | Björn Persson <bjorn@rombobjörn.se> | 2013-08-13 15:19:53 +0200 |
|---|---|---|
| committer | Björn Persson <bjorn@rombobjörn.se> | 2013-08-13 15:19:53 +0200 |
| commit | 98656d5ea6079457992eb779787d7be51ab2917a (patch) | |
| tree | 3f6e91ef3c65c1e325726fd7c05848ce66efc87d /comfignat.mk | |
| parent | a52ebd4b95b52d281c90837027d081ce4378130d (diff) | |
Keeping most of the build system in a subdirectory in the source tree should also work now.
Diffstat (limited to 'comfignat.mk')
| -rw-r--r-- | comfignat.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/comfignat.mk b/comfignat.mk index 07ae8d2..15fb467 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -136,9 +136,10 @@ install_cp_flags = ${if ${DESTDIR},--preserve=timestamps} # srcdir := ${abspath ${dir ${lastword ${MAKEFILE_LIST}}}} -# srcdir is the root of the source tree, computed as the directory part of the -# last pathname in MAKEFILE_LIST – which is this file since there is no include -# directive above this point. +# srcdir is the directory in the source tree where makefiles and project files +# are. It may be the root of the source tree or a subdirectory. It is computed +# as the directory part of the last pathname in MAKEFILE_LIST – which is this +# file since there is no include directive above this point. stage_bindir = ${stagedir}${bindir} stage_libexecdir = ${stagedir}${libexecdir} @@ -446,8 +447,10 @@ options_building = ${addprefix -X,${option_values}} # Some other data that the rules below need: # -delegation_command := @$${MAKE} --file=${abspath ${firstword ${MAKEFILE_LIST}}}\ - --include-dir=${srcdir} --no-print-directory +main_makefile := ${firstword ${MAKEFILE_LIST}} +delegation_command = @$${MAKE} --file=${abspath ${main_makefile}} \ + --include-dir=${abspath ${dir ${main_makefile}}} \ + --no-print-directory # delegation_command is the Make command line that delegating makefiles in # separate build directories use to delegate commands to the main makefile. The # first pathname in MAKEFILE_LIST is the main makefile. |