summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-03-25 12:38:01 +0100
committerBenoit Foucher <benoit@zeroc.com>2015-03-25 12:38:01 +0100
commit68c8085139de5bd5525ee40c17074ad0f101f6d9 (patch)
tree7a2249f3c553354bf57438b2635bd4937d138eb7 /objective-c
parentRemove gradle plugin install task (diff)
downloadice-68c8085139de5bd5525ee40c17074ad0f101f6d9.tar.bz2
ice-68c8085139de5bd5525ee40c17074ad0f101f6d9.tar.xz
ice-68c8085139de5bd5525ee40c17074ad0f101f6d9.zip
Fixed Objective-C make install
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/config/Make.rules8
1 files changed, 4 insertions, 4 deletions
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules
index f0d18ad06f3..3dc4a03e3dc 100644
--- a/objective-c/config/Make.rules
+++ b/objective-c/config/Make.rules
@@ -21,7 +21,7 @@ prefix ?= /opt/Ice-$(VERSION)
#
# The "root directory" for runpath embedded in executables. Can be set
-# to change the runpath added to Ice executables. The default is
+# to change the runpath added to Ice executables. The default is
# platform dependent.
#
#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
@@ -74,7 +74,7 @@ else
endif
headerdir = $(top_srcdir)/include
-install_includedir := $(prefix)/include
+install_includedir := $(prefix)/include/objc
install_libdir := $(prefix)/$(libsubdir)
install_bindir := $(prefix)/$(binsubdir)
@@ -88,7 +88,7 @@ SLICE2OBJCFLAGS = $(ICECPPFLAGS)
FLEXFLAGS =
BISONFLAGS = -dvt
CPPFLAGS += -I$(includedir)
-LDFLAGS = $(OBJCFLAGS) -L$(libdir)
+LDFLAGS = $(OBJCFLAGS) -L$(libdir)
ifdef ice_src_dist
ifeq ($(ice_cpp_dir), $(ice_dir)/cpp)
@@ -102,7 +102,7 @@ endif
# This cannot use .cpp:.o as we have multiple types of source files.
-EVERYTHING = all clean install
+EVERYTHING = all clean install
EVERYTHING_EXCEPT_ALL = clean install
.SUFFIXES: