diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-06 08:58:29 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-06 08:58:33 -0700 |
| commit | f10d127d36ada5b202cdea521e61b05522beb192 (patch) | |
| tree | 44ae75bf0745de49fb46616afd4cf577cf7a258a /utils/Makefile.in | |
| parent | c3af26045aa44286482fbfe93097f24b48cfb6a3 (diff) | |
| parent | 384a55ef9f3387ed33eadab3eefe5057b4daeadb (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
libc/misc/utmp/utent.c
libc/sysdeps/linux/i386/bits/syscalls.h
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'utils/Makefile.in')
| -rw-r--r-- | utils/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/utils/Makefile.in b/utils/Makefile.in index 2aae1df71..89cb800e9 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -40,7 +40,8 @@ CFLAGS-iconv := $(CFLAGS-utils) \ -DL_iconv_main \ CFLAGS-locale := $(CFLAGS-utils) - +CFLAGS-getconf :=$(CFLAGS-utils) \ + -DGETCONF_DIR='"$(CURDIR)"' # "make hostutils" flags @@ -76,6 +77,7 @@ utils_OUT := $(top_builddir)utils DEPS-ldconfig := $(utils_DIR)/chroot_realpath.c DEPS-ldconfig.host := $(DEPS-ldconfig) +utils_OBJ := getconf ifeq ($(HAVE_SHARED),y) utils_OBJ += ldconfig ldd endif @@ -115,6 +117,7 @@ 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)usr/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 @@ -128,6 +131,6 @@ endif objclean-y += CLEAN_utils CLEAN_utils: - $(do_rm) $(addprefix $(utils_OUT)/, ldconfig ldd iconv locale *.host) + $(do_rm) $(addprefix $(utils_OUT)/, getconf iconv ldconfig ldd locale *.host) $(Q)# This is a hack.. $(Q)$(RM) $(utils_OUT)/.*.dep |