Do not install libc-XXXX.h files in "make install".

 glibc does not have them, so should be safe.

diff --git a/Makefile.in b/Makefile.in
index d2b3b2b..e80b149 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,8 +205,8 @@ install_headers: headers $(top_builddir)extra/scripts/unifdef
        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
        top_builddir=$(top_builddir) \
        $(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include
-       printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
-               $(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
+       # Disabled. If libc-internal.h is needed, document here why!
+       #printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' >$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
        echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
                $(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
        $(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h

diff --git a/extra/scripts/install_headers.sh b/extra/scripts/install_headers.sh
index d38d853..e531444 100755 (executable)
--- a/extra/scripts/install_headers.sh
+++ b/extra/scripts/install_headers.sh
@@ -41,13 +41,20 @@ IFS=''
 while read -r filename; do
        if test -d "$1/$filename"; then
                mkdir -p "$2/$filename" 2>/dev/null
-       else
-               # NB: unifdef exits with 1 if output is not
-               # exactly the same as input. That's ok.
-               # Do not abort the script if unifdef "fails"!
-               "$top_builddir/extra/scripts/unifdef" -UUCLIBC_INTERNAL "$1/$filename" \
-                   | sed -e '/^\(rtld\|lib\(c\|m\|resolv\|dl\|intl\|rt\|nsl\|util\|crypt\|pthread\)\)_hidden_proto[    ]*([a-zA-Z0-9_]*)$/d' >"$2/$filename"
+               continue
        fi
+       if test x"${filename##libc-*.h}" = x""; then
+               # Do not install libc-XXXX.h files
+               continue
+       fi
+       # NB: unifdef exits with 1 if output is not
+       # exactly the same as input. That's ok.
+       # Do not abort the script if unifdef "fails"!
+       # NB2: careful with sed command arguments, they contain tab character
+       "$top_builddir/extra/scripts/unifdef" -UUCLIBC_INTERNAL -U_LIBC "$1/$filename" \
+       | sed -e '/^rtld_hidden_proto[  ]*([a-zA-Z0-9_]*)$/d' \
+       | sed -e '/^lib\(c\|m\|resolv\|dl\|intl\|rt\|nsl\|util\|crypt\|pthread\)_hidden_proto[  ]*([a-zA-Z0-9_]*)$/d' \
+       >"$2/$filename"
 done
 )