a directory is a directory

Change-Id: I6384a9d86123ab354414cf6e9366b4f9e46f1c1f

solenv/gbuild/TargetLocations.mk

@@ -163,9 +163,9 @@ gb_UITarget_get_target = $(WORKDIR)/UITarget/$(1).done
 gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external
 gb_UnoApiTarget_get_headers_target = $(WORKDIR)/UnoApiTarget/$(1).headers
 gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
-gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap$(2)
-gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive$(2)
-gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal$(2)
+gb_UnoApiHeadersTarget_get_bootstrap_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap
+gb_UnoApiHeadersTarget_get_comprehensive_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive
+gb_UnoApiHeadersTarget_get_dir = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal
 gb_UnoApiHeadersTarget_get_bootstrap_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/bootstrap.done
 gb_UnoApiHeadersTarget_get_comprehensive_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/comprehensive.done
 gb_UnoApiHeadersTarget_get_target = $(WORKDIR)/UnoApiHeadersTarget/$(1)/normal.done

solenv/gbuild/UnoApiTarget.mk

@@ -347,29 +347,29 @@ $(call gb_UnoApiHeadersTarget_get_comprehensive_target,$(1)) : UNOAPI_DEPS :=
 # need dummy recipes so that header files are delivered in Package_inc;
 # otherwise make will consider the header to be up-to-date because it was
 # actually built by the recipe for gb_UnoApiHeadersTarget_get_target
-$(call gb_UnoApiHeadersTarget_get_dir,$(1),/%.hdl) :
+$(call gb_UnoApiHeadersTarget_get_dir,$(1))/%.hdl :
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_dir,$(1),/%.hpp) :
+$(call gb_UnoApiHeadersTarget_get_dir,$(1))/%.hpp :
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hdl) :
+$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1))/%.hdl :
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hpp) :
+$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1))/%.hpp :
 	touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hdl) :
+$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1))/%.hdl :
 	mkdir -p `dirname $$@` && touch $$@
 
-$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hpp) :
+$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1))/%.hpp :
 	mkdir -p `dirname $$@` && touch $$@
 
 endef
 
 # ensure that new urd triggers the dummy rule to rebuild the headers
 define gb_UnoApiHeadersTarget_add_headerfile
-$(call gb_UnoApiHeadersTarget_get_dir,$(1),/$(3)) : \
+$(call gb_UnoApiHeadersTarget_get_dir,$(1))/$(3) : \
 	$(call gb_UnoApiPartTarget_get_target,$(basename $(2)).urd)
 
 endef