summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svl/Makefile10
-rw-r--r--svtools/Makefile10
-rw-r--r--toolkit/Makefile10
-rw-r--r--tools/Makefile10
4 files changed, 32 insertions, 8 deletions
diff --git a/svl/Makefile b/svl/Makefile
index d020b04dba7c..9ab4b8ba83f4 100644
--- a/svl/Makefile
+++ b/svl/Makefile
@@ -25,6 +25,12 @@
#
#*************************************************************************
-include ../solenv/inc/gbuild.mk
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd))))
+
+gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
+
+$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Makefile b/svtools/Makefile
index d020b04dba7c..9ab4b8ba83f4 100644
--- a/svtools/Makefile
+++ b/svtools/Makefile
@@ -25,6 +25,12 @@
#
#*************************************************************************
-include ../solenv/inc/gbuild.mk
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd))))
+
+gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
+
+$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/toolkit/Makefile b/toolkit/Makefile
index d020b04dba7c..9ab4b8ba83f4 100644
--- a/toolkit/Makefile
+++ b/toolkit/Makefile
@@ -25,6 +25,12 @@
#
#*************************************************************************
-include ../solenv/inc/gbuild.mk
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd))))
+
+gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
+
+$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tools/Makefile b/tools/Makefile
index d020b04dba7c..9ab4b8ba83f4 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,6 +25,12 @@
#
#*************************************************************************
-include ../solenv/inc/gbuild.mk
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-$(eval $(call gb_Module_make_global_targets,$(notdir $(shell pwd))))
+
+gb_CURRENT_MODULE := $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))
+
+$(eval $(call gb_Module_make_global_targets,$(gb_CURRENT_MODULE)))
+
+# vim: set noet sw=4 ts=4: