Revert "try to fix duplicated slashes in the generated lib*.so files"

[uclinux-h8/uClibc.git] / utils / Makefile.in

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 2aae1df..65364d7 100644 (file)
--- 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
 
@@ -67,6 +68,8 @@ BUILD_CFLAGS-iconv.host    := $(BUILD_CFLAGS-utils) \
                        -include $(top_builddir)extra/locale/c8tables.h \
                        -I$(top_srcdir)libc/misc/wchar -DL_iconv_main
 
+BUILD_CFLAGS-getconf.host  := $(BUILD_CFLAGS-utils) \
+                               -DGETCONF_DIR='"$(CURDIR)"'
 
 # Rules
 
@@ -76,6 +79,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 +119,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)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 +133,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