summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-01 18:39:33 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-01 19:38:09 (GMT)
commit6458e8278c9317f8254eeca9aaf86ce60f3a257b (patch)
treed8b31bd6f1f618d5b63b5c8859c2d7f2ea8433a2
parent657c4a9d6c2e649d86307f46ce9d5e44192f6e7a (diff)
Fix build on macos
... where install does not have a -D option. Signed-off-by: Alexey Neyman <stilor@att.net>
-rw-r--r--utils/Makefile.in15
1 files changed, 11 insertions, 4 deletions
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 5378973..461e953 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -117,15 +117,22 @@ $(hostutils_OBJ): $(utils_OUT)/%.host : $(utils_DIR)/%.c
install-y += utils_install
# This installs both utils and hostutils, so doesn't depend on either.
+$(PREFIX)$(DEVEL_PREFIX)bin $(PREFIX)$(RUNTIME_PREFIX)sbin:
+ $(do_mkdir)
+
+utils_install: $(PREFIX)$(DEVEL_PREFIX)bin
+ifeq ($(HAVE_SHARED),y)
+utils_install: $(PREFIX)$(RUNTIME_PREFIX)sbin
+endif
utils_install: $(addsuffix $(DOTHOST), $(utils_OBJ) $(utils_LOCALE_OBJ))
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
+ $(Q)$(INSTALL) -m 755 $(utils_OUT)/getconf$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/getconf
ifeq ($(HAVE_SHARED),y)
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
+ $(Q)$(INSTALL) -m 755 $(utils_OUT)/ldd$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/ldd
+ $(Q)$(INSTALL) -m 755 $(utils_OUT)/ldconfig$(DOTHOST) $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig
endif
ifeq ($(UCLIBC_HAS_LOCALE),y)
- $(Q)$(INSTALL) -D -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
+ $(Q)$(INSTALL) -m 755 $(utils_OUT)/iconv$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/iconv
$(Q)$(INSTALL) -m 755 $(utils_OUT)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)bin/locale
endif