diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-04-04 09:43:59 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-04-04 09:43:59 +0000 |
| commit | 299d09c4e8a56a9d5e0a26a28a7813a9e64d2d6d (patch) | |
| tree | 434821bff5a0f533edb472a28f969dd30c4f3393 /ACE/include/makeinclude/wrapper_macros.GNU | |
| parent | 0a44f8606a3631dbb1715c26d5216806ab548cbd (diff) | |
| download | ATCD-299d09c4e8a56a9d5e0a26a28a7813a9e64d2d6d.tar.gz | |
Mon Apr 4 09:42:27 UTC 2011 Martin Corino <mcorino@remedy.nl>
* include/makeinclude/rules.local.GNU:
* include/makeinclude/wrapper_macros.GNU:
Added support to build from symlinked project root.
Diffstat (limited to 'ACE/include/makeinclude/wrapper_macros.GNU')
| -rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index b7cccc84f14..35696ff585a 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -238,12 +238,24 @@ threads ?= 1 symlinks ?= relative link_groups ?= 0 mcpp ?= 0 +root_is_symlink ?= 0 SOVERSION ?= SONAME ?= -ifeq ($(PWD),) - PWD=$(shell pwd) +ifeq ($(root_is_symlink),1) + ifneq ($(symlinks),relative) + warn_output:=$(warning WARNING: You should really use relative library symlinks with symlinked root) + endif + use_pwd_call = 1 + ### use 'real' pwd command from shell; internal make command resolves symlinks + ifeq ($(PWD),) + PWD=$(shell $(SHELL) -c pwd) + endif +else + ifeq ($(PWD),) + PWD=$(shell pwd) + endif endif ifeq ($(ACE_MKDIR),) |