summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-22 18:19:23 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-22 18:19:23 +0200
commite1c1e4995d7acf2533c34d5578833b40df86e536 (patch)
tree2c6823ba77c359bffdf0f5ebb90206475d56b3e5 /objective-c
parentFix (ICE-8034) - JS Ice/exceptions failure (diff)
downloadice-e1c1e4995d7acf2533c34d5578833b40df86e536.tar.bz2
ice-e1c1e4995d7acf2533c34d5578833b40df86e536.tar.xz
ice-e1c1e4995d7acf2533c34d5578833b40df86e536.zip
Fixed XcodeSDK Objective-C installation bug
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/config/Make.xcodesdk.rules12
1 files changed, 4 insertions, 8 deletions
diff --git a/objective-c/config/Make.xcodesdk.rules b/objective-c/config/Make.xcodesdk.rules
index a7f6e927647..49e8243b1d0 100644
--- a/objective-c/config/Make.xcodesdk.rules
+++ b/objective-c/config/Make.xcodesdk.rules
@@ -37,15 +37,11 @@ ifneq ($(filter src/%,$1),)
$(make-xcodesdk-component-with-config)
-$(top_srcdir)/IceSDK/$3.sdk/usr/include/objc/%.h: include/objc/%.h
- $(Q)$(call install-data,objc/$$(*).h,include,$(top_srcdir)/IceSDK/$3.sdk/usr/include)
+$$(eval $$(call install-data-files,include/objc/$(subst ObjC,,$2).h,include,\
+ $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5))
-$(install_libdir)/IceSDK/$3.sdk/usr/include/objc/%.h: include/objc/%.h
- $(Q)$(call install-data,objc/$$(*).h,include,$(install_libdir)/IceSDK/$3.sdk/usr/include)
-
-$5:: $(top_srcdir)/IceSDK/$3.sdk/usr/include/objc/$(subst ObjC,,$2).h
-
-$5_install:: $(install_libdir)/IceSDK/$3.sdk/usr/include/objc/$(subst ObjC,,$2).h
+$$(eval $$(call install-data-files,include/objc/$(subst ObjC,,$2).h,include,\
+ $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install))
$5_clean::
$(Q)$(RM) $(top_srcdir)/IceSDK/$3.sdk/usr/include/objc/$(subst ObjC,,$2).h