diff options
| -rw-r--r-- | Makefile.in | 22 | ||||
| -rw-r--r-- | Rules.mak | 6 | ||||
| -rw-r--r-- | utils/Makefile.in | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in index 65dd4fda7..995347bf0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,8 +186,8 @@ $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscal fi $(LOCAL_INSTALL_PATH): - $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX= \ - DEVEL_PREFIX=/usr \ + $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \ + DEVEL_PREFIX=/usr/ \ HOSTCC="$(HOSTCC)" \ install @@ -281,7 +281,7 @@ HEADERS_RM-$(UCLIBC_SUSV3_LEGACY) += sys/timeb.h regexp.h HEADERS_RM-$(UCLIBC_SUSV4_LEGACY) += utime.h ucontext.h ifneq ($(findstring install,$(MAKECMDGOALS)),) -$(addprefix $(PREFIX)$(DEVEL_PREFIX),/include $(MULTILIB_DIR)): +$(addprefix $(PREFIX)$(DEVEL_PREFIX),include $(MULTILIB_DIR)): $(do_mkdir) # avoid warning about duplicate targets in rule or overrides ifneq ($(abspath $(RUNTIME_PREFIX)$(MULTILIB_DIR)),$(abspath $(DEVEL_PREFIX)$(MULTILIB_DIR))) @@ -289,22 +289,22 @@ $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR): $(do_mkdir) endif endif -install_headers: headers $(top_builddir)extra/scripts/unifdef | $(PREFIX)$(DEVEL_PREFIX)/include - @$(call disp_install,"include -> $(PREFIX)$(DEVEL_PREFIX)/include") +install_headers: headers $(top_builddir)extra/scripts/unifdef | $(PREFIX)$(DEVEL_PREFIX)include + @$(call disp_install,"include -> $(PREFIX)$(DEVEL_PREFIX)include") $(Q)top_builddir=$(top_builddir) \ $(top_srcdir)extra/scripts/install_headers.sh \ - include $(PREFIX)$(DEVEL_PREFIX)/include + include $(PREFIX)$(DEVEL_PREFIX)include ifneq ($(O),) # only run this step in O is set i.e. make O=/my/builddir/ .. - @$(call disp_install,"$(top_builddir)/include -> $(PREFIX)$(DEVEL_PREFIX)/include") + @$(call disp_install,"$(top_builddir)/include -> $(PREFIX)$(DEVEL_PREFIX)include") $(Q)top_builddir=$(top_builddir) \ $(top_srcdir)extra/scripts/install_headers.sh \ - $(top_builddir)/include $(PREFIX)$(DEVEL_PREFIX)/include + $(top_builddir)/include $(PREFIX)$(DEVEL_PREFIX)include endif - $(Q)cd $(PREFIX)$(DEVEL_PREFIX)/include && $(RM) -r $(HEADERS_RM-) + $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-) ifeq ($(UCLIBC_HAS_WCHAR),) - $(Q)cd $(PREFIX)$(DEVEL_PREFIX)/include && mv -f wchar-stub.h wchar.h + $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h else - $(Q)cd $(PREFIX)$(DEVEL_PREFIX)/include && $(RM) -f wchar-stub.h + $(Q)cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -f wchar-stub.h endif # Installs startfiles @@ -95,9 +95,9 @@ export ARCH # Make certain these contain a final "/", but no "//"s. TARGET_SUBARCH:=$(call qstrip,$(shell grep -s '^TARGET_SUBARCH' $(top_builddir)/.config | $(SED) -e 's/^TARGET_SUBARCH=//')) TARGET_SUBARCH:=$(call qstrip,$(TARGET_SUBARCH)) -RUNTIME_PREFIX:=$(strip $(subst //,/, $(call qstrip,$(RUNTIME_PREFIX)))) -DEVEL_PREFIX:=$(strip $(subst //,/, $(call qstrip,$(DEVEL_PREFIX)))) -MULTILIB_DIR:=$(strip $(subst //,/, $(call qstrip,$(MULTILIB_DIR)))) +RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(RUNTIME_PREFIX))))) +DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(DEVEL_PREFIX))))) +MULTILIB_DIR:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(MULTILIB_DIR))))) KERNEL_HEADERS:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(KERNEL_HEADERS))))) export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR diff --git a/utils/Makefile.in b/utils/Makefile.in index f3e67eb52..65364d771 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -119,14 +119,14 @@ install-y += utils_install # This installs both utils and hostutils, so doesn't depend on either. 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) -D -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) -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 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)/locale$(DOTHOST) $(PREFIX)$(DEVEL_PREFIX)/bin/locale + $(Q)$(INSTALL) -D -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 |