diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-06-05 14:45:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-06-05 14:45:40 +0200 |
| commit | 19a85d076e00bc3119d1f963586d763c51df65d4 (patch) | |
| tree | 64e74931912053ac4bd73847378cce2164fa64ec | |
| parent | Fix TestCommon libdir (diff) | |
| download | ice-19a85d076e00bc3119d1f963586d763c51df65d4.tar.bz2 ice-19a85d076e00bc3119d1f963586d763c51df65d4.tar.xz ice-19a85d076e00bc3119d1f963586d763c51df65d4.zip | |
Better fix to allow parent directory with spaces (for bug #95)
| -rw-r--r-- | cpp/Makefile | 2 | ||||
| -rw-r--r-- | objective-c/Makefile | 2 | ||||
| -rw-r--r-- | php/Makefile | 2 | ||||
| -rw-r--r-- | python/Makefile | 2 | ||||
| -rw-r--r-- | python/python/Makefile | 2 | ||||
| -rw-r--r-- | ruby/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index f8edb149cc1..f6a078a0554 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir := .. -lang_srcdir := $(top_srcdir)/cpp +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/objective-c/Makefile b/objective-c/Makefile index 0e158ec1ecb..b9c9326dffe 100644 --- a/objective-c/Makefile +++ b/objective-c/Makefile @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir := .. -lang_srcdir := $(top_srcdir)/objective-c +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/php/Makefile b/php/Makefile index 6fdd2a69dcf..ffc3d41a4c9 100644 --- a/php/Makefile +++ b/php/Makefile @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir := .. -lang_srcdir := $(top_srcdir)/php +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules diff --git a/python/Makefile b/python/Makefile index 23e99b96314..f0a634d8373 100644 --- a/python/Makefile +++ b/python/Makefile @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir := .. -lang_srcdir := $(top_srcdir)/python +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST)))))) ifeq ($(PYTHON),) PYTHON = python diff --git a/python/python/Makefile b/python/python/Makefile index f98e4963864..5a795920bd5 100644 --- a/python/python/Makefile +++ b/python/python/Makefile @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir := ../.. -lang_srcdir := $(top_srcdir)/python +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/ruby/Makefile b/ruby/Makefile index 3b52a459ff4..6a63e2c3e38 100644 --- a/ruby/Makefile +++ b/ruby/Makefile @@ -8,7 +8,7 @@ # ********************************************************************** top_srcdir := .. -lang_srcdir := $(top_srcdir)/ruby +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules |