# HG changeset patch
# User Bruce Korb <bkorb@gnu.org>
# Date 1289941620 28800
# Node ID c1a1f592f8799db819b948143a072dd91feecf6a
# Parent  6d29729bdec1963f8b643464910c1d5143d6c73c
replace include_HEADERS with pkgincludedir_HEADERS

diff --git a/modules/alloca-opt b/modules/alloca-opt
--- a/modules/alloca-opt
+++ b/modules/alloca-opt
@@ -13,7 +13,7 @@
 gl_FUNC_ALLOCA
 
 Makefile.am:
-nodist_include_HEADERS += $(ALLOCA_H)
+nodist_pkgincludedir_HEADERS += $(ALLOCA_H)
 EXTRA_HEADERS += alloca.h
 
 BUILT_SOURCES += $(ALLOCA_H)
diff --git a/modules/arg-nonnull b/modules/arg-nonnull
--- a/modules/arg-nonnull
+++ b/modules/arg-nonnull
@@ -12,7 +12,7 @@
 configure.ac:
 
 Makefile.am:
-nodist_include_HEADERS += arg-nonnull.h
+nodist_pkgincludedir_HEADERS += arg-nonnull.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
diff --git a/modules/argz b/modules/argz
--- a/modules/argz
+++ b/modules/argz
@@ -18,7 +18,7 @@
 gl_FUNC_ARGZ
 
 Makefile.am:
-nodist_include_HEADERS += $(ARGZ_H)
+nodist_pkgincludedir_HEADERS += $(ARGZ_H)
 EXTRA_HEADERS += argz.h
 
 BUILT_SOURCES += $(ARGZ_H)
diff --git a/modules/arpa_inet b/modules/arpa_inet
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -16,7 +16,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += arpa/inet.h
+nobase_nodist_pkgincludedir_HEADERS += arpa/inet.h
 
 BUILT_SOURCES += arpa/inet.h
 
diff --git a/modules/byteswap b/modules/byteswap
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -11,7 +11,7 @@
 gl_BYTESWAP
 
 Makefile.am:
-nodist_include_HEADERS += $(BYTESWAP_H)
+nodist_pkgincludedir_HEADERS += $(BYTESWAP_H)
 EXTRA_HEADERS += byteswap.h
 
 BUILT_SOURCES += $(BYTESWAP_H)
diff --git a/modules/c++defs b/modules/c++defs
--- a/modules/c++defs
+++ b/modules/c++defs
@@ -12,7 +12,7 @@
 configure.ac:
 
 Makefile.am:
-nodist_include_HEADERS += c++defs.h
+nodist_pkgincludedir_HEADERS += c++defs.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
diff --git a/modules/ctype b/modules/ctype
--- a/modules/ctype
+++ b/modules/ctype
@@ -14,7 +14,7 @@
 gl_CTYPE_H
 
 Makefile.am:
-nodist_include_HEADERS += ctype.h
+nodist_pkgincludedir_HEADERS += ctype.h
 
 BUILT_SOURCES += ctype.h
 
diff --git a/modules/dirent b/modules/dirent
--- a/modules/dirent
+++ b/modules/dirent
@@ -16,7 +16,7 @@
 gl_DIRENT_H
 
 Makefile.am:
-nodist_include_HEADERS += dirent.h
+nodist_pkgincludedir_HEADERS += dirent.h
 
 BUILT_SOURCES += dirent.h
 
diff --git a/modules/errno b/modules/errno
--- a/modules/errno
+++ b/modules/errno
@@ -12,7 +12,7 @@
 gl_HEADER_ERRNO_H
 
 Makefile.am:
-nodist_include_HEADERS += $(ERRNO_H)
+nodist_pkgincludedir_HEADERS += $(ERRNO_H)
 EXTRA_HEADERS += errno.h
 
 BUILT_SOURCES += $(ERRNO_H)
diff --git a/modules/fcntl-h b/modules/fcntl-h
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -18,7 +18,7 @@
 gl_FCNTL_H
 
 Makefile.am:
-nodist_include_HEADERS += fcntl.h
+nodist_pkgincludedir_HEADERS += fcntl.h
 
 BUILT_SOURCES += fcntl.h
 
diff --git a/modules/float b/modules/float
--- a/modules/float
+++ b/modules/float
@@ -12,7 +12,7 @@
 gl_FLOAT_H
 
 Makefile.am:
-nodist_include_HEADERS += $(FLOAT_H)
+nodist_pkgincludedir_HEADERS += $(FLOAT_H)
 EXTRA_HEADERS += float.h
 
 BUILT_SOURCES += $(FLOAT_H)
diff --git a/modules/fnmatch b/modules/fnmatch
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -24,7 +24,7 @@
 gl_FUNC_FNMATCH_POSIX
 
 Makefile.am:
-nodist_include_HEADERS += $(FNMATCH_H)
+nodist_pkgincludedir_HEADERS += $(FNMATCH_H)
 EXTRA_HEADERS += fnmatch.h
 
 BUILT_SOURCES += $(FNMATCH_H)
diff --git a/modules/getopt-posix b/modules/getopt-posix
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -19,7 +19,7 @@
 gl_FUNC_GETOPT_POSIX
 
 Makefile.am:
-nodist_include_HEADERS += $(GETOPT_H)
+nodist_pkgincludedir_HEADERS += $(GETOPT_H)
 EXTRA_HEADERS += getopt.h
 
 BUILT_SOURCES += $(GETOPT_H)
diff --git a/modules/glob b/modules/glob
--- a/modules/glob
+++ b/modules/glob
@@ -30,7 +30,7 @@
 gl_GLOB
 
 Makefile.am:
-nodist_include_HEADERS += $(GLOB_H)
+nodist_pkgincludedir_HEADERS += $(GLOB_H)
 EXTRA_HEADERS += glob.h
 
 BUILT_SOURCES += $(GLOB_H)
diff --git a/modules/iconv-h b/modules/iconv-h
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -15,7 +15,7 @@
 gl_ICONV_H
 
 Makefile.am:
-nodist_include_HEADERS += $(ICONV_H)
+nodist_pkgincludedir_HEADERS += $(ICONV_H)
 EXTRA_HEADERS += iconv.h
 
 BUILT_SOURCES += $(ICONV_H)
diff --git a/modules/iconv_open b/modules/iconv_open
--- a/modules/iconv_open
+++ b/modules/iconv_open
@@ -22,7 +22,7 @@
 
 Makefile.am:
 iconv_headers = iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
-nodist_include_HEADERS += $(iconv_headers)
+nodist_pkgincludedir_HEADERS += $(iconv_headers)
 
 iconv_open-aix.h: iconv_open-aix.gperf
 	$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t
diff --git a/modules/inttypes b/modules/inttypes
--- a/modules/inttypes
+++ b/modules/inttypes
@@ -17,7 +17,7 @@
 gl_INTTYPES_H
 
 Makefile.am:
-nodist_include_HEADERS += inttypes.h
+nodist_pkgincludedir_HEADERS += inttypes.h
 
 BUILT_SOURCES += inttypes.h
 
diff --git a/modules/langinfo b/modules/langinfo
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -15,7 +15,7 @@
 gl_LANGINFO_H
 
 Makefile.am:
-nodist_include_HEADERS += langinfo.h
+nodist_pkgincludedir_HEADERS += langinfo.h
 
 BUILT_SOURCES += langinfo.h
 
diff --git a/modules/link-warning b/modules/link-warning
--- a/modules/link-warning
+++ b/modules/link-warning
@@ -12,7 +12,7 @@
 configure.ac:
 
 Makefile.am:
-nodist_include_HEADERS += link-warning.h
+nodist_pkgincludedir_HEADERS += link-warning.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
diff --git a/modules/locale b/modules/locale
--- a/modules/locale
+++ b/modules/locale
@@ -17,7 +17,7 @@
 gl_LOCALE_H
 
 Makefile.am:
-nodist_include_HEADERS += locale.h
+nodist_pkgincludedir_HEADERS += locale.h
 
 BUILT_SOURCES += locale.h
 
diff --git a/modules/math b/modules/math
--- a/modules/math
+++ b/modules/math
@@ -15,7 +15,7 @@
 gl_MATH_H
 
 Makefile.am:
-nodist_include_HEADERS += math.h
+nodist_pkgincludedir_HEADERS += math.h
 
 BUILT_SOURCES += math.h
 
diff --git a/modules/netdb b/modules/netdb
--- a/modules/netdb
+++ b/modules/netdb
@@ -16,7 +16,7 @@
 gl_HEADER_NETDB
 
 Makefile.am:
-nodist_include_HEADERS += netdb.h
+nodist_pkgincludedir_HEADERS += netdb.h
 
 BUILT_SOURCES += netdb.h
 
diff --git a/modules/netinet_in b/modules/netinet_in
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -14,7 +14,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += $(NETINET_IN_H)
+nobase_nodist_pkgincludedir_HEADERS += $(NETINET_IN_H)
 EXTRA_HEADERS += netinet/in.h
 
 BUILT_SOURCES += $(NETINET_IN_H)
diff --git a/modules/poll-h b/modules/poll-h
--- a/modules/poll-h
+++ b/modules/poll-h
@@ -15,7 +15,7 @@
 gl_POLL_H
 
 Makefile.am:
-nodist_include_HEADERS += poll.h
+nodist_pkgincludedir_HEADERS += poll.h
 
 BUILT_SOURCES += poll.h
 
diff --git a/modules/pthread b/modules/pthread
--- a/modules/pthread
+++ b/modules/pthread
@@ -13,7 +13,7 @@
 gl_PTHREAD_CHECK
 
 Makefile.am:
-nodist_include_HEADERS += $(PTHREAD_H)
+nodist_pkgincludedir_HEADERS += $(PTHREAD_H)
 EXTRA_HEADERS += pthread.h
 
 BUILT_SOURCES += $(PTHREAD_H)
diff --git a/modules/pty b/modules/pty
--- a/modules/pty
+++ b/modules/pty
@@ -14,7 +14,7 @@
 gl_PTY_H
 
 Makefile.am:
-nodist_include_HEADERS += pty.h
+nodist_pkgincludedir_HEADERS += pty.h
 
 BUILT_SOURCES += pty.h
 
diff --git a/modules/sched b/modules/sched
--- a/modules/sched
+++ b/modules/sched
@@ -12,7 +12,7 @@
 gl_SCHED_H
 
 Makefile.am:
-nodist_include_HEADERS += $(SCHED_H)
+nodist_pkgincludedir_HEADERS += $(SCHED_H)
 EXTRA_HEADERS += sched.h
 
 BUILT_SOURCES += $(SCHED_H)
diff --git a/modules/search b/modules/search
--- a/modules/search
+++ b/modules/search
@@ -15,7 +15,7 @@
 gl_SEARCH_H
 
 Makefile.am:
-nodist_include_HEADERS += search.h
+nodist_pkgincludedir_HEADERS += search.h
 
 BUILT_SOURCES += search.h
 
diff --git a/modules/selinux-h b/modules/selinux-h
--- a/modules/selinux-h
+++ b/modules/selinux-h
@@ -18,7 +18,7 @@
 AC_REQUIRE([AC_C_INLINE])
 
 Makefile.am:
-nobase_nodist_include_HEADERS += selinux/selinux.h
+nobase_nodist_pkgincludedir_HEADERS += selinux/selinux.h
 
 lib_SOURCES += se-context.in.h se-selinux.in.h
 
diff --git a/modules/signal b/modules/signal
--- a/modules/signal
+++ b/modules/signal
@@ -15,7 +15,7 @@
 gl_SIGNAL_H
 
 Makefile.am:
-nodist_include_HEADERS += signal.h
+nodist_pkgincludedir_HEADERS += signal.h
 
 BUILT_SOURCES += signal.h
 
diff --git a/modules/spawn b/modules/spawn
--- a/modules/spawn
+++ b/modules/spawn
@@ -16,7 +16,7 @@
 gl_SPAWN_H
 
 Makefile.am:
-nodist_include_HEADERS += spawn.h
+nodist_pkgincludedir_HEADERS += spawn.h
 
 BUILT_SOURCES += spawn.h
 
diff --git a/modules/stdarg b/modules/stdarg
--- a/modules/stdarg
+++ b/modules/stdarg
@@ -19,7 +19,7 @@
 gl_STDARG_H
 
 Makefile.am:
-nodist_include_HEADERS += $(STDARG_H)
+nodist_pkgincludedir_HEADERS += $(STDARG_H)
 EXTRA_HEADERS += stdarg.h
 
 BUILT_SOURCES += $(STDARG_H)
diff --git a/modules/stdbool b/modules/stdbool
--- a/modules/stdbool
+++ b/modules/stdbool
@@ -12,7 +12,7 @@
 AM_STDBOOL_H
 
 Makefile.am:
-nodist_include_HEADERS += $(STDBOOL_H)
+nodist_pkgincludedir_HEADERS += $(STDBOOL_H)
 EXTRA_HEADERS += stdbool.h
 
 BUILT_SOURCES += $(STDBOOL_H)
diff --git a/modules/stddef b/modules/stddef
--- a/modules/stddef
+++ b/modules/stddef
@@ -13,7 +13,7 @@
 gl_STDDEF_H
 
 Makefile.am:
-nodist_include_HEADERS += $(STDDEF_H)
+nodist_pkgincludedir_HEADERS += $(STDDEF_H)
 EXTRA_HEADERS += stddef.h
 
 BUILT_SOURCES += $(STDDEF_H)
diff --git a/modules/stdint b/modules/stdint
--- a/modules/stdint
+++ b/modules/stdint
@@ -20,7 +20,7 @@
 gl_STDINT_H
 
 Makefile.am:
-nodist_include_HEADERS += $(STDINT_H)
+nodist_pkgincludedir_HEADERS += $(STDINT_H)
 EXTRA_HEADERS += stdint.h
 
 BUILT_SOURCES += $(STDINT_H)
diff --git a/modules/stdio b/modules/stdio
--- a/modules/stdio
+++ b/modules/stdio
@@ -19,7 +19,7 @@
 gl_STDIO_H
 
 Makefile.am:
-nodist_include_HEADERS += stdio.h
+nodist_pkgincludedir_HEADERS += stdio.h
 
 BUILT_SOURCES += stdio.h
 
diff --git a/modules/stdlib b/modules/stdlib
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -18,7 +18,7 @@
 gl_STDLIB_H
 
 Makefile.am:
-nodist_include_HEADERS += stdlib.h
+nodist_pkgincludedir_HEADERS += stdlib.h
 
 BUILT_SOURCES += stdlib.h
 
diff --git a/modules/string b/modules/string
--- a/modules/string
+++ b/modules/string
@@ -17,7 +17,7 @@
 gl_HEADER_STRING_H
 
 Makefile.am:
-nodist_include_HEADERS += string.h
+nodist_pkgincludedir_HEADERS += string.h
 
 BUILT_SOURCES += string.h
 
diff --git a/modules/strings b/modules/strings
--- a/modules/strings
+++ b/modules/strings
@@ -14,7 +14,7 @@
 gl_HEADER_STRINGS_H
 
 Makefile.am:
-nodist_include_HEADERS += strings.h
+nodist_pkgincludedir_HEADERS += strings.h
 
 BUILT_SOURCES += strings.h
 
diff --git a/modules/sys_file b/modules/sys_file
--- a/modules/sys_file
+++ b/modules/sys_file
@@ -14,7 +14,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/file.h
+nobase_nodist_pkgincludedir_HEADERS += sys/file.h
 
 BUILT_SOURCES += sys/file.h
 
diff --git a/modules/sys_ioctl b/modules/sys_ioctl
--- a/modules/sys_ioctl
+++ b/modules/sys_ioctl
@@ -16,7 +16,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/ioctl.h
+nobase_nodist_pkgincludedir_HEADERS += sys/ioctl.h
 
 BUILT_SOURCES += sys/ioctl.h
 
diff --git a/modules/sys_select b/modules/sys_select
--- a/modules/sys_select
+++ b/modules/sys_select
@@ -17,7 +17,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/select.h
+nobase_nodist_pkgincludedir_HEADERS += sys/select.h
 
 BUILT_SOURCES += sys/select.h
 
diff --git a/modules/sys_socket b/modules/sys_socket
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -20,7 +20,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/socket.h
+nobase_nodist_pkgincludedir_HEADERS += sys/socket.h
 
 BUILT_SOURCES += sys/socket.h
 
diff --git a/modules/sys_stat b/modules/sys_stat
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -18,7 +18,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/stat.h
+nobase_nodist_pkgincludedir_HEADERS += sys/stat.h
 
 BUILT_SOURCES += sys/stat.h
 
diff --git a/modules/sys_time b/modules/sys_time
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -16,7 +16,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/time.h
+nobase_nodist_pkgincludedir_HEADERS += sys/time.h
 
 BUILT_SOURCES += sys/time.h
 
diff --git a/modules/sys_times b/modules/sys_times
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -15,7 +15,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/times.h
+nobase_nodist_pkgincludedir_HEADERS += sys/times.h
 
 BUILT_SOURCES += sys/times.h
 
diff --git a/modules/sys_utsname b/modules/sys_utsname
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -15,7 +15,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/utsname.h
+nobase_nodist_pkgincludedir_HEADERS += sys/utsname.h
 
 BUILT_SOURCES += sys/utsname.h
 
diff --git a/modules/sys_wait b/modules/sys_wait
--- a/modules/sys_wait
+++ b/modules/sys_wait
@@ -15,7 +15,7 @@
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_include_HEADERS += sys/wait.h
+nobase_nodist_pkgincludedir_HEADERS += sys/wait.h
 
 BUILT_SOURCES += sys/wait.h
 
diff --git a/modules/sysexits b/modules/sysexits
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -12,7 +12,7 @@
 gl_SYSEXITS
 
 Makefile.am:
-nodist_include_HEADERS += $(SYSEXITS_H)
+nodist_pkgincludedir_HEADERS += $(SYSEXITS_H)
 EXTRA_HEADERS += sysexits.h
 
 BUILT_SOURCES += $(SYSEXITS_H)
diff --git a/modules/termios b/modules/termios
--- a/modules/termios
+++ b/modules/termios
@@ -14,7 +14,7 @@
 gl_TERMIOS_H
 
 Makefile.am:
-nodist_include_HEADERS += termios.h
+nodist_pkgincludedir_HEADERS += termios.h
 
 BUILT_SOURCES += termios.h
 
diff --git a/modules/time b/modules/time
--- a/modules/time
+++ b/modules/time
@@ -17,7 +17,7 @@
 gl_HEADER_TIME_H
 
 Makefile.am:
-nodist_include_HEADERS += time.h
+nodist_pkgincludedir_HEADERS += time.h
 
 BUILT_SOURCES += time.h
 
diff --git a/modules/unistd b/modules/unistd
--- a/modules/unistd
+++ b/modules/unistd
@@ -16,7 +16,7 @@
 gl_UNISTD_H
 
 Makefile.am:
-nodist_include_HEADERS += unistd.h
+nodist_pkgincludedir_HEADERS += unistd.h
 
 BUILT_SOURCES += unistd.h
 
diff --git a/modules/unitypes b/modules/unitypes
--- a/modules/unitypes
+++ b/modules/unitypes
@@ -12,7 +12,7 @@
 gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
 
 Makefile.am:
-nodist_include_HEADERS += $(LIBUNISTRING_UNITYPES_H)
+nodist_pkgincludedir_HEADERS += $(LIBUNISTRING_UNITYPES_H)
 EXTRA_HEADERS += unitypes.h
 
 BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
diff --git a/modules/unused-parameter b/modules/unused-parameter
--- a/modules/unused-parameter
+++ b/modules/unused-parameter
@@ -12,7 +12,7 @@
 configure.ac:
 
 Makefile.am:
-nodist_include_HEADERS += unused-parameter.h
+nodist_pkgincludedir_HEADERS += unused-parameter.h
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
diff --git a/modules/warn-on-use b/modules/warn-on-use
--- a/modules/warn-on-use
+++ b/modules/warn-on-use
@@ -13,7 +13,7 @@
 configure.ac:
 
 Makefile.am:
-nodist_include_HEADERS += warn-on-use.h
+nodist_pkgincludedir_HEADERS += warn-on-use.h
 
 BUILT_SOURCES += warn-on-use.h
 # The warn-on-use.h that gets inserted into generated .h files is the same as
diff --git a/modules/wchar b/modules/wchar
--- a/modules/wchar
+++ b/modules/wchar
@@ -17,7 +17,7 @@
 gl_WCHAR_H
 
 Makefile.am:
-nodist_include_HEADERS += wchar.h
+nodist_pkgincludedir_HEADERS += wchar.h
 
 BUILT_SOURCES += wchar.h
 
diff --git a/modules/wctype b/modules/wctype
--- a/modules/wctype
+++ b/modules/wctype
@@ -15,7 +15,7 @@
 gl_WCTYPE_H
 
 Makefile.am:
-nodist_include_HEADERS += wctype.h
+nodist_pkgincludedir_HEADERS += wctype.h
 
 BUILT_SOURCES += wctype.h