From 79f700b068bebd3057de3c8cc644edf590560e23 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Tue, 16 Nov 2010 13:34:36 -0800 Subject: [PATCH] spell the pkginclude directory correctly. --- gnulib-tool | 10 +- libposix/.gitignore | 3 + libposix/bootstrap | 65 +++++--- libposix/lib/Makefile.am | 4 +- modules/alloca-opt | 2 +- modules/arg-nonnull | 2 +- modules/argz | 2 +- modules/arpa_inet | 2 +- modules/byteswap | 2 +- modules/c++defs | 2 +- modules/ctype | 2 +- modules/dirent | 2 +- modules/errno | 2 +- modules/fcntl-h | 2 +- modules/float | 2 +- modules/fnmatch | 2 +- modules/getopt-posix | 2 +- modules/glob | 2 +- modules/iconv-h | 2 +- modules/iconv_open | 2 +- modules/inttypes | 2 +- modules/langinfo | 2 +- modules/libposix | 318 --------------------------------------- modules/link-warning | 2 +- modules/locale | 2 +- modules/math | 2 +- modules/netdb | 2 +- modules/netinet_in | 2 +- modules/poll-h | 2 +- modules/pthread | 2 +- modules/pty | 2 +- modules/sched | 2 +- modules/search | 2 +- modules/selinux-h | 2 +- modules/signal | 2 +- modules/spawn | 2 +- modules/stdarg | 2 +- modules/stdbool | 2 +- modules/stddef | 2 +- modules/stdint | 2 +- modules/stdio | 2 +- modules/stdlib | 2 +- modules/string | 2 +- modules/strings | 2 +- modules/sys_file | 2 +- modules/sys_ioctl | 2 +- modules/sys_select | 2 +- modules/sys_socket | 2 +- modules/sys_stat | 2 +- modules/sys_time | 2 +- modules/sys_times | 2 +- modules/sys_utsname | 2 +- modules/sys_wait | 2 +- modules/sysexits | 2 +- modules/termios | 2 +- modules/time | 2 +- modules/unistd | 2 +- modules/unitypes | 2 +- modules/unused-parameter | 2 +- modules/warn-on-use | 2 +- modules/wchar | 2 +- modules/wctype | 2 +- 62 files changed, 114 insertions(+), 400 deletions(-) delete mode 100644 modules/libposix diff --git a/gnulib-tool b/gnulib-tool index ab0b3783b2..b7d7614484 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2872,8 +2872,8 @@ func_emit_lib_Makefile_am () echo if test -z "$makefile_name"; then echo "SUBDIRS =" - echo "nodist_include_HEADERS =" - echo "nobase_nodist_include_HEADERS =" + echo "nodist_pkginclude_HEADERS =" + echo "nobase_nodist_pkginclude_HEADERS =" echo "noinst_HEADERS =" echo "noinst_LIBRARIES =" echo "noinst_LTLIBRARIES =" @@ -2932,7 +2932,7 @@ func_emit_lib_Makefile_am () else # Don't install header files when generated library is not installed. sed_transform_HEADERS_primaries="\ - /^\(nobase_\)\{0,1\}nodist_include_HEADERS *=.*$/d + /^\(nobase_\)\{0,1\}nodist_pkginclude_HEADERS *=.*$/d /^EXTRA_HEADERS *=.*$/d " # By default, the generated library should not be installed. @@ -3181,8 +3181,8 @@ func_emit_tests_Makefile_am () if ! $for_test; then echo "check_PROGRAMS =" fi - echo "nodist_include_HEADERS =" - echo "nobase_nodist_include_HEADERS =" + echo "nodist_pkginclude_HEADERS =" + echo "nobase_nodist_pkginclude_HEADERS =" echo "noinst_HEADERS =" echo "noinst_LIBRARIES =" if $use_libtests; then diff --git a/libposix/.gitignore b/libposix/.gitignore index b078d37a6b..873ceeb5c4 100644 --- a/libposix/.gitignore +++ b/libposix/.gitignore @@ -46,3 +46,6 @@ stamp-h1 /tests/test-* unused-parameter.h warn-on-use.h +/tests +/tmp + diff --git a/libposix/bootstrap b/libposix/bootstrap index 987bd31026..10c37a92f7 100755 --- a/libposix/bootstrap +++ b/libposix/bootstrap @@ -2,29 +2,58 @@ PATH=..:$PATH -# Bootstrap for autotools. -gnulib-tool --import --lib=libposix --makefile-name=gnulib.mk \ - --macro-prefix=LIBPOSIX --libtool --no-changelog --symlink \ - --with-tests --with-c++-tests --with-longrunning-tests \ - git-version-gen libposix +mkdir tmp +mkdir tmp/modules + { echo alloca + posix-modules + } | sort -u > tmp/posix-list -# No need to maintain a Makefile.am just to include gnulib.mk. -mv tests/gnulib.mk tests/Makefile.am + posix_list=$(grep -v '^$' tmp/posix-list) + + cat > tmp/modules/libposix <<- _EOF_ + Description: + Wrap up all the posix modules into an installable libposix.la. + + Files: + + Depends-on: + ${posix_list} + + configure.ac: + + Makefile.am: + lib_LTLIBRARIES = libposix.la + Include: -# Sanity check the module list for synchronisation issues. -{ - sed_noblanks='/^$/d' - posix-modules |sed -e "$sed_noblanks" -e 's|$| posix-modules|' - gnulib-tool --extract-dependencies libposix \ - |sed -e "$sed_noblanks" -e 's|$| libposix|' -} | awk '_[$1] {delete _[$1]; next} - {_[$1]=$2} - END {for (k in _) - printf ("bootstrap: warning: `%s'\'' only appears in %s\n", k, _[k])}' \ - | sort + License: + LGPL + Maintainer: + Bruce Korb + Gary V. Vaughan + _EOF_ + + +opts='--local-dir=tmp + --import + --lib=libposix + --makefile-name=gnulib.mk + --macro-prefix=LIBPOSIX + --libtool + --no-changelog + --symlink + --with-tests + --with-c++-tests + --with-longrunning-tests' + +# Bootstrap for autotools. +gnulib-tool ${opts} git-version-gen libposix + + +# No need to maintain a Makefile.am just to include gnulib.mk. +mv tests/gnulib.mk tests/Makefile.am # Run autotools. autoreconf --force --install --verbose --symlink diff --git a/libposix/lib/Makefile.am b/libposix/lib/Makefile.am index 9be48fce60..0a31f4e5ea 100644 --- a/libposix/lib/Makefile.am +++ b/libposix/lib/Makefile.am @@ -3,8 +3,8 @@ SUFFIXES = EXTRA_DIST = EXTRA_HEADERS = -nodist_include_HEADERS = -nobase_nodist_include_HEADERS = +nodist_pkginclude_HEADERS = +nobase_nodist_pkginclude_HEADERS = CLEANFILES = MOSTLYCLEANDIRS = diff --git a/modules/alloca-opt b/modules/alloca-opt index 9424453753..4ae08b0dd8 100644 --- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -13,7 +13,7 @@ configure.ac: gl_FUNC_ALLOCA Makefile.am: -nodist_pkgincludedir_HEADERS += $(ALLOCA_H) +nodist_pkginclude_HEADERS += $(ALLOCA_H) EXTRA_HEADERS += alloca.h BUILT_SOURCES += $(ALLOCA_H) diff --git a/modules/arg-nonnull b/modules/arg-nonnull index bf7c376ae9..37c5ea663d 100644 --- a/modules/arg-nonnull +++ b/modules/arg-nonnull @@ -12,7 +12,7 @@ Depends-on: configure.ac: Makefile.am: -nodist_pkgincludedir_HEADERS += arg-nonnull.h +nodist_pkginclude_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 index 7654517235..1a33f37d40 100644 --- a/modules/argz +++ b/modules/argz @@ -18,7 +18,7 @@ configure.ac: gl_FUNC_ARGZ Makefile.am: -nodist_pkgincludedir_HEADERS += $(ARGZ_H) +nodist_pkginclude_HEADERS += $(ARGZ_H) EXTRA_HEADERS += argz.h BUILT_SOURCES += $(ARGZ_H) diff --git a/modules/arpa_inet b/modules/arpa_inet index 9d9f624c34..0588280c47 100644 --- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -16,7 +16,7 @@ gl_HEADER_ARPA_INET AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += arpa/inet.h +nobase_nodist_pkginclude_HEADERS += arpa/inet.h BUILT_SOURCES += arpa/inet.h diff --git a/modules/byteswap b/modules/byteswap index a2c85a96b6..d16af57f6a 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -11,7 +11,7 @@ configure.ac: gl_BYTESWAP Makefile.am: -nodist_pkgincludedir_HEADERS += $(BYTESWAP_H) +nodist_pkginclude_HEADERS += $(BYTESWAP_H) EXTRA_HEADERS += byteswap.h BUILT_SOURCES += $(BYTESWAP_H) diff --git a/modules/c++defs b/modules/c++defs index b955732b36..9cd5a8b9d6 100644 --- a/modules/c++defs +++ b/modules/c++defs @@ -12,7 +12,7 @@ Depends-on: configure.ac: Makefile.am: -nodist_pkgincludedir_HEADERS += c++defs.h +nodist_pkginclude_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 index 2ffaefda02..e37e622c64 100644 --- a/modules/ctype +++ b/modules/ctype @@ -14,7 +14,7 @@ configure.ac: gl_CTYPE_H Makefile.am: -nodist_pkgincludedir_HEADERS += ctype.h +nodist_pkginclude_HEADERS += ctype.h BUILT_SOURCES += ctype.h diff --git a/modules/dirent b/modules/dirent index 5a02c4a7aa..094a84e2b6 100644 --- a/modules/dirent +++ b/modules/dirent @@ -16,7 +16,7 @@ configure.ac: gl_DIRENT_H Makefile.am: -nodist_pkgincludedir_HEADERS += dirent.h +nodist_pkginclude_HEADERS += dirent.h BUILT_SOURCES += dirent.h diff --git a/modules/errno b/modules/errno index fb06c61e32..221bebf0de 100644 --- a/modules/errno +++ b/modules/errno @@ -12,7 +12,7 @@ configure.ac: gl_HEADER_ERRNO_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(ERRNO_H) +nodist_pkginclude_HEADERS += $(ERRNO_H) EXTRA_HEADERS += errno.h BUILT_SOURCES += $(ERRNO_H) diff --git a/modules/fcntl-h b/modules/fcntl-h index 098e3a0f3c..6a33fc7ac0 100644 --- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -18,7 +18,7 @@ configure.ac: gl_FCNTL_H Makefile.am: -nodist_pkgincludedir_HEADERS += fcntl.h +nodist_pkginclude_HEADERS += fcntl.h BUILT_SOURCES += fcntl.h diff --git a/modules/float b/modules/float index 4efa719bd0..004d2bf42a 100644 --- a/modules/float +++ b/modules/float @@ -12,7 +12,7 @@ configure.ac: gl_FLOAT_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(FLOAT_H) +nodist_pkginclude_HEADERS += $(FLOAT_H) EXTRA_HEADERS += float.h BUILT_SOURCES += $(FLOAT_H) diff --git a/modules/fnmatch b/modules/fnmatch index e658401aae..cff8bad5a0 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -24,7 +24,7 @@ configure.ac: gl_FUNC_FNMATCH_POSIX Makefile.am: -nodist_pkgincludedir_HEADERS += $(FNMATCH_H) +nodist_pkginclude_HEADERS += $(FNMATCH_H) EXTRA_HEADERS += fnmatch.h BUILT_SOURCES += $(FNMATCH_H) diff --git a/modules/getopt-posix b/modules/getopt-posix index 9e456aab74..93d7fccf10 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -19,7 +19,7 @@ configure.ac: gl_FUNC_GETOPT_POSIX Makefile.am: -nodist_pkgincludedir_HEADERS += $(GETOPT_H) +nodist_pkginclude_HEADERS += $(GETOPT_H) EXTRA_HEADERS += getopt.h BUILT_SOURCES += $(GETOPT_H) diff --git a/modules/glob b/modules/glob index 241b2b181d..beaf476c11 100644 --- a/modules/glob +++ b/modules/glob @@ -30,7 +30,7 @@ configure.ac: gl_GLOB Makefile.am: -nodist_pkgincludedir_HEADERS += $(GLOB_H) +nodist_pkginclude_HEADERS += $(GLOB_H) EXTRA_HEADERS += glob.h BUILT_SOURCES += $(GLOB_H) diff --git a/modules/iconv-h b/modules/iconv-h index ceab90337d..7a01af9a8b 100644 --- a/modules/iconv-h +++ b/modules/iconv-h @@ -15,7 +15,7 @@ configure.ac: gl_ICONV_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(ICONV_H) +nodist_pkginclude_HEADERS += $(ICONV_H) EXTRA_HEADERS += iconv.h BUILT_SOURCES += $(ICONV_H) diff --git a/modules/iconv_open b/modules/iconv_open index 7f8b910c63..194440b046 100644 --- a/modules/iconv_open +++ b/modules/iconv_open @@ -22,7 +22,7 @@ gl_FUNC_ICONV_OPEN 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_pkgincludedir_HEADERS += $(iconv_headers) +nodist_pkginclude_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 index a8b6e95bd3..991fe4e1a3 100644 --- a/modules/inttypes +++ b/modules/inttypes @@ -17,7 +17,7 @@ configure.ac: gl_INTTYPES_H Makefile.am: -nodist_pkgincludedir_HEADERS += inttypes.h +nodist_pkginclude_HEADERS += inttypes.h BUILT_SOURCES += inttypes.h diff --git a/modules/langinfo b/modules/langinfo index e22ece2883..e864c91a89 100644 --- a/modules/langinfo +++ b/modules/langinfo @@ -15,7 +15,7 @@ configure.ac: gl_LANGINFO_H Makefile.am: -nodist_pkgincludedir_HEADERS += langinfo.h +nodist_pkginclude_HEADERS += langinfo.h BUILT_SOURCES += langinfo.h diff --git a/modules/libposix b/modules/libposix deleted file mode 100644 index f43874d327..0000000000 --- a/modules/libposix +++ /dev/null @@ -1,318 +0,0 @@ -Description: -Wrap up all the posix modules into an installable libposix.la. - -Files: - -Depends-on: -_Exit -accept -acos -acosl -alloca -alphasort -arpa_inet -asin -asinl -atan -atan2 -atanl -atexit -atoll -bind -btowc -calloc-posix -canonicalize-lgpl -cbrt -ceil -ceilf -ceill -chown -close -connect -copysign -cos -cosh -cosl -ctype -dirent -dirfd -dprintf -dprintf-posix -dup2 -duplocale -environ -erf -erfc -errno -exp -expl -extensions -fabs -faccessat -fchdir -fclose -fcntl -fcntl-h -fdopendir -fflush -float -floor -floorf -floorl -fmod -fnmatch -fnmatch-posix -fopen -fprintf-posix -free -freopen -frexp -frexpl -fseek -fseeko -fsync -ftell -ftello -futimens -getaddrinfo -getcwd -getdelim -getgroups -gethostname -getline -getlogin -getlogin_r -getopt-posix -getpeername -getsockname -getsockopt -getsubopt -gettimeofday -glob -grantpt -hypot -iconv -iconv_open -iconv_open-utf -imaxabs -imaxdiv -inet_ntop -inet_pton -inttypes -ioctl -isblank -isfinite -isinf -isnan -j0 -j1 -jn -langinfo -lchown -ldexp -ldexpl -lgamma -link -linkat -listen -locale -log -log10 -log1p -logb -logl -lseek -lstat -malloc-posix -math -mbrlen -mbrtowc -mbsinit -mbsnrtowcs -mbsrtowcs -memchr -memcmp -memcpy -memmove -memset -mkdir -mkdtemp -mkfifo -mkfifoat -mknod -mkstemp -mktime -modf -nanosleep -netdb -netinet_in -nextafter -nl_langinfo -open -openat -perror -poll -poll-h -popen -posix_spawn -posix_spawn_file_actions_addclose -posix_spawn_file_actions_adddup2 -posix_spawn_file_actions_addopen -posix_spawn_file_actions_destroy -posix_spawn_file_actions_init -posix_spawnattr_destroy -posix_spawnattr_getflags -posix_spawnattr_getpgroup -posix_spawnattr_getschedparam -posix_spawnattr_getschedpolicy -posix_spawnattr_getsigdefault -posix_spawnattr_getsigmask -posix_spawnattr_init -posix_spawnattr_setflags -posix_spawnattr_setpgroup -posix_spawnattr_setschedparam -posix_spawnattr_setschedpolicy -posix_spawnattr_setsigdefault -posix_spawnattr_setsigmask -posix_spawnp -pow -pread -printf-posix -progname -ptsname -pwrite -raise -readlink -readlinkat -realloc-posix -recv -recvfrom -regex -remainder -remove -rename -renameat -rint -rmdir -round -roundf -roundl -scandir -sched -search -select -send -sendto -setenv -setsockopt -shutdown -sigaction -signal -signbit -sigpipe -sigprocmask -sin -sinh -sinl -sleep -snprintf -snprintf-posix -socket -spawn -sprintf-posix -sqrt -sqrtl -stat -stdarg -stdbool -stddef -stdint -stdio -stdlib -stpcpy -stpncpy -strcase -strcspn -strdup-posix -strerror -string -strncat -strndup -strnlen -strpbrk -strptime -strsignal -strstr -strstr-simple -strtod -strtoimax -strtok_r -strtol -strtoll -strtoul -strtoull -strtoumax -symlink -symlinkat -sys_select -sys_socket -sys_stat -sys_time -sys_times -sys_utsname -sys_wait -system-posix -tan -tanh -tanl -tcgetsid -termios -time -time_r -times -tmpfile -trunc -truncf -truncl -tsearch -ttyname_r -tzset -uname -unistd -unlink -unlockpt -unsetenv -utimensat -vdprintf -vdprintf-posix -vfprintf-posix -vprintf-posix -vsnprintf -vsnprintf-posix -vsprintf-posix -waitpid -wchar -wcrtomb -wcsnrtombs -wcsrtombs -wctob -wctype -wcwidth -write -y0 -y1 -yn - -configure.ac: - -Makefile.am: -lib_LTLIBRARIES = libposix.la - -Include: - -License: -LGPL - -Maintainer: -Bruce Korb -Gary V. Vaughan diff --git a/modules/link-warning b/modules/link-warning index 7e78e19468..f4d04bd6ed 100644 --- a/modules/link-warning +++ b/modules/link-warning @@ -12,7 +12,7 @@ Depends-on: configure.ac: Makefile.am: -nodist_pkgincludedir_HEADERS += link-warning.h +nodist_pkginclude_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 index 9f282ab5f8..298b924966 100644 --- a/modules/locale +++ b/modules/locale @@ -17,7 +17,7 @@ configure.ac: gl_LOCALE_H Makefile.am: -nodist_pkgincludedir_HEADERS += locale.h +nodist_pkginclude_HEADERS += locale.h BUILT_SOURCES += locale.h diff --git a/modules/math b/modules/math index 028811540b..dfc677aadd 100644 --- a/modules/math +++ b/modules/math @@ -15,7 +15,7 @@ configure.ac: gl_MATH_H Makefile.am: -nodist_pkgincludedir_HEADERS += math.h +nodist_pkginclude_HEADERS += math.h BUILT_SOURCES += math.h diff --git a/modules/netdb b/modules/netdb index 9609b56a49..49f58f15d3 100644 --- a/modules/netdb +++ b/modules/netdb @@ -16,7 +16,7 @@ configure.ac: gl_HEADER_NETDB Makefile.am: -nodist_pkgincludedir_HEADERS += netdb.h +nodist_pkginclude_HEADERS += netdb.h BUILT_SOURCES += netdb.h diff --git a/modules/netinet_in b/modules/netinet_in index d76a6ba826..28b80c8e27 100644 --- a/modules/netinet_in +++ b/modules/netinet_in @@ -14,7 +14,7 @@ gl_HEADER_NETINET_IN AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += $(NETINET_IN_H) +nobase_nodist_pkginclude_HEADERS += $(NETINET_IN_H) EXTRA_HEADERS += netinet/in.h BUILT_SOURCES += $(NETINET_IN_H) diff --git a/modules/poll-h b/modules/poll-h index 601ca930d7..8fc15cdb1a 100644 --- a/modules/poll-h +++ b/modules/poll-h @@ -15,7 +15,7 @@ configure.ac: gl_POLL_H Makefile.am: -nodist_pkgincludedir_HEADERS += poll.h +nodist_pkginclude_HEADERS += poll.h BUILT_SOURCES += poll.h diff --git a/modules/pthread b/modules/pthread index e53ca3c1c8..7aaaffac40 100644 --- a/modules/pthread +++ b/modules/pthread @@ -13,7 +13,7 @@ configure.ac: gl_PTHREAD_CHECK Makefile.am: -nodist_pkgincludedir_HEADERS += $(PTHREAD_H) +nodist_pkginclude_HEADERS += $(PTHREAD_H) EXTRA_HEADERS += pthread.h BUILT_SOURCES += $(PTHREAD_H) diff --git a/modules/pty b/modules/pty index 03cdd7740c..f490b344b8 100644 --- a/modules/pty +++ b/modules/pty @@ -14,7 +14,7 @@ configure.ac: gl_PTY_H Makefile.am: -nodist_pkgincludedir_HEADERS += pty.h +nodist_pkginclude_HEADERS += pty.h BUILT_SOURCES += pty.h diff --git a/modules/sched b/modules/sched index 01abb9e3f0..128ec35eec 100644 --- a/modules/sched +++ b/modules/sched @@ -12,7 +12,7 @@ configure.ac: gl_SCHED_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(SCHED_H) +nodist_pkginclude_HEADERS += $(SCHED_H) EXTRA_HEADERS += sched.h BUILT_SOURCES += $(SCHED_H) diff --git a/modules/search b/modules/search index 812f79262f..3f7ecc060c 100644 --- a/modules/search +++ b/modules/search @@ -15,7 +15,7 @@ configure.ac: gl_SEARCH_H Makefile.am: -nodist_pkgincludedir_HEADERS += search.h +nodist_pkginclude_HEADERS += search.h BUILT_SOURCES += search.h diff --git a/modules/selinux-h b/modules/selinux-h index 89e9a0c6c1..589729df3a 100644 --- a/modules/selinux-h +++ b/modules/selinux-h @@ -18,7 +18,7 @@ gl_HEADERS_SELINUX_CONTEXT_H AC_REQUIRE([AC_C_INLINE]) Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += selinux/selinux.h +nobase_nodist_pkginclude_HEADERS += selinux/selinux.h lib_SOURCES += se-context.in.h se-selinux.in.h diff --git a/modules/signal b/modules/signal index c4f70f29d9..ed9b14737e 100644 --- a/modules/signal +++ b/modules/signal @@ -15,7 +15,7 @@ configure.ac: gl_SIGNAL_H Makefile.am: -nodist_pkgincludedir_HEADERS += signal.h +nodist_pkginclude_HEADERS += signal.h BUILT_SOURCES += signal.h diff --git a/modules/spawn b/modules/spawn index 64ae6845d2..eb0d4c13a6 100644 --- a/modules/spawn +++ b/modules/spawn @@ -16,7 +16,7 @@ configure.ac: gl_SPAWN_H Makefile.am: -nodist_pkgincludedir_HEADERS += spawn.h +nodist_pkginclude_HEADERS += spawn.h BUILT_SOURCES += spawn.h diff --git a/modules/stdarg b/modules/stdarg index 463913cf12..105a54c52d 100644 --- a/modules/stdarg +++ b/modules/stdarg @@ -19,7 +19,7 @@ configure.ac: gl_STDARG_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDARG_H) +nodist_pkginclude_HEADERS += $(STDARG_H) EXTRA_HEADERS += stdarg.h BUILT_SOURCES += $(STDARG_H) diff --git a/modules/stdbool b/modules/stdbool index c4b840e593..5c1fe3ce36 100644 --- a/modules/stdbool +++ b/modules/stdbool @@ -12,7 +12,7 @@ configure.ac: AM_STDBOOL_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDBOOL_H) +nodist_pkginclude_HEADERS += $(STDBOOL_H) EXTRA_HEADERS += stdbool.h BUILT_SOURCES += $(STDBOOL_H) diff --git a/modules/stddef b/modules/stddef index 6817984e68..62e874a3cf 100644 --- a/modules/stddef +++ b/modules/stddef @@ -13,7 +13,7 @@ configure.ac: gl_STDDEF_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDDEF_H) +nodist_pkginclude_HEADERS += $(STDDEF_H) EXTRA_HEADERS += stddef.h BUILT_SOURCES += $(STDDEF_H) diff --git a/modules/stdint b/modules/stdint index 83b84b8048..bbf208a5b3 100644 --- a/modules/stdint +++ b/modules/stdint @@ -20,7 +20,7 @@ configure.ac: gl_STDINT_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDINT_H) +nodist_pkginclude_HEADERS += $(STDINT_H) EXTRA_HEADERS += stdint.h BUILT_SOURCES += $(STDINT_H) diff --git a/modules/stdio b/modules/stdio index ca1d05ba15..33022d5054 100644 --- a/modules/stdio +++ b/modules/stdio @@ -19,7 +19,7 @@ configure.ac: gl_STDIO_H Makefile.am: -nodist_pkgincludedir_HEADERS += stdio.h +nodist_pkginclude_HEADERS += stdio.h BUILT_SOURCES += stdio.h diff --git a/modules/stdlib b/modules/stdlib index 0e858ac912..b277afee6d 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -18,7 +18,7 @@ configure.ac: gl_STDLIB_H Makefile.am: -nodist_pkgincludedir_HEADERS += stdlib.h +nodist_pkginclude_HEADERS += stdlib.h BUILT_SOURCES += stdlib.h diff --git a/modules/string b/modules/string index 5f85af834b..d57b4ef8da 100644 --- a/modules/string +++ b/modules/string @@ -17,7 +17,7 @@ configure.ac: gl_HEADER_STRING_H Makefile.am: -nodist_pkgincludedir_HEADERS += string.h +nodist_pkginclude_HEADERS += string.h BUILT_SOURCES += string.h diff --git a/modules/strings b/modules/strings index d3b222b63e..e5ef663942 100644 --- a/modules/strings +++ b/modules/strings @@ -14,7 +14,7 @@ configure.ac: gl_HEADER_STRINGS_H Makefile.am: -nodist_pkgincludedir_HEADERS += strings.h +nodist_pkginclude_HEADERS += strings.h BUILT_SOURCES += strings.h diff --git a/modules/sys_file b/modules/sys_file index ad15ddb242..27d87ec9f4 100644 --- a/modules/sys_file +++ b/modules/sys_file @@ -14,7 +14,7 @@ gl_HEADER_SYS_FILE_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/file.h +nobase_nodist_pkginclude_HEADERS += sys/file.h BUILT_SOURCES += sys/file.h diff --git a/modules/sys_ioctl b/modules/sys_ioctl index 758f215caa..f5051be2e0 100644 --- a/modules/sys_ioctl +++ b/modules/sys_ioctl @@ -16,7 +16,7 @@ gl_SYS_IOCTL_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/ioctl.h +nobase_nodist_pkginclude_HEADERS += sys/ioctl.h BUILT_SOURCES += sys/ioctl.h diff --git a/modules/sys_select b/modules/sys_select index bd68b89402..9c24a6d639 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -17,7 +17,7 @@ gl_HEADER_SYS_SELECT AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/select.h +nobase_nodist_pkginclude_HEADERS += sys/select.h BUILT_SOURCES += sys/select.h diff --git a/modules/sys_socket b/modules/sys_socket index 7243f0b042..3987eb4e32 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -20,7 +20,7 @@ gl_HEADER_SYS_SOCKET AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/socket.h +nobase_nodist_pkginclude_HEADERS += sys/socket.h BUILT_SOURCES += sys/socket.h diff --git a/modules/sys_stat b/modules/sys_stat index 9e0fdcead3..ba70116eac 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -18,7 +18,7 @@ gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/stat.h +nobase_nodist_pkginclude_HEADERS += sys/stat.h BUILT_SOURCES += sys/stat.h diff --git a/modules/sys_time b/modules/sys_time index f925e85a07..f4dfa19b90 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -16,7 +16,7 @@ gl_HEADER_SYS_TIME_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/time.h +nobase_nodist_pkginclude_HEADERS += sys/time.h BUILT_SOURCES += sys/time.h diff --git a/modules/sys_times b/modules/sys_times index 1955e6c890..2ce8e73e2f 100644 --- a/modules/sys_times +++ b/modules/sys_times @@ -15,7 +15,7 @@ gl_SYS_TIMES_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/times.h +nobase_nodist_pkginclude_HEADERS += sys/times.h BUILT_SOURCES += sys/times.h diff --git a/modules/sys_utsname b/modules/sys_utsname index 51c1913d29..ff60b4ed5f 100644 --- a/modules/sys_utsname +++ b/modules/sys_utsname @@ -15,7 +15,7 @@ gl_SYS_UTSNAME_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/utsname.h +nobase_nodist_pkginclude_HEADERS += sys/utsname.h BUILT_SOURCES += sys/utsname.h diff --git a/modules/sys_wait b/modules/sys_wait index 9e418f3988..ad42623fe7 100644 --- a/modules/sys_wait +++ b/modules/sys_wait @@ -15,7 +15,7 @@ gl_SYS_WAIT_H AC_PROG_MKDIR_P Makefile.am: -nobase_nodist_pkgincludedir_HEADERS += sys/wait.h +nobase_nodist_pkginclude_HEADERS += sys/wait.h BUILT_SOURCES += sys/wait.h diff --git a/modules/sysexits b/modules/sysexits index 0c24799308..191ba60ca9 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -12,7 +12,7 @@ configure.ac: gl_SYSEXITS Makefile.am: -nodist_pkgincludedir_HEADERS += $(SYSEXITS_H) +nodist_pkginclude_HEADERS += $(SYSEXITS_H) EXTRA_HEADERS += sysexits.h BUILT_SOURCES += $(SYSEXITS_H) diff --git a/modules/termios b/modules/termios index 41731813b9..34180fb1a7 100644 --- a/modules/termios +++ b/modules/termios @@ -14,7 +14,7 @@ configure.ac: gl_TERMIOS_H Makefile.am: -nodist_pkgincludedir_HEADERS += termios.h +nodist_pkginclude_HEADERS += termios.h BUILT_SOURCES += termios.h diff --git a/modules/time b/modules/time index b946689a86..d5b615cd5d 100644 --- a/modules/time +++ b/modules/time @@ -17,7 +17,7 @@ configure.ac: gl_HEADER_TIME_H Makefile.am: -nodist_pkgincludedir_HEADERS += time.h +nodist_pkginclude_HEADERS += time.h BUILT_SOURCES += time.h diff --git a/modules/unistd b/modules/unistd index 5377703376..cb6ba7fb0f 100644 --- a/modules/unistd +++ b/modules/unistd @@ -16,7 +16,7 @@ configure.ac: gl_UNISTD_H Makefile.am: -nodist_pkgincludedir_HEADERS += unistd.h +nodist_pkginclude_HEADERS += unistd.h BUILT_SOURCES += unistd.h diff --git a/modules/unitypes b/modules/unitypes index dcd3de66fd..ed061de8dc 100644 --- a/modules/unitypes +++ b/modules/unitypes @@ -12,7 +12,7 @@ configure.ac: gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) Makefile.am: -nodist_pkgincludedir_HEADERS += $(LIBUNISTRING_UNITYPES_H) +nodist_pkginclude_HEADERS += $(LIBUNISTRING_UNITYPES_H) EXTRA_HEADERS += unitypes.h BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H) diff --git a/modules/unused-parameter b/modules/unused-parameter index 32a666a6a4..9a3d0d41cb 100644 --- a/modules/unused-parameter +++ b/modules/unused-parameter @@ -12,7 +12,7 @@ Depends-on: configure.ac: Makefile.am: -nodist_pkgincludedir_HEADERS += unused-parameter.h +nodist_pkginclude_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 index e0c74a17cb..3cf3281b4b 100644 --- a/modules/warn-on-use +++ b/modules/warn-on-use @@ -13,7 +13,7 @@ Depends-on: configure.ac: Makefile.am: -nodist_pkgincludedir_HEADERS += warn-on-use.h +nodist_pkginclude_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 index 3b24c5d6ae..8a700fc7e7 100644 --- a/modules/wchar +++ b/modules/wchar @@ -17,7 +17,7 @@ configure.ac: gl_WCHAR_H Makefile.am: -nodist_pkgincludedir_HEADERS += wchar.h +nodist_pkginclude_HEADERS += wchar.h BUILT_SOURCES += wchar.h diff --git a/modules/wctype b/modules/wctype index 93b8873382..9f86e028ca 100644 --- a/modules/wctype +++ b/modules/wctype @@ -15,7 +15,7 @@ configure.ac: gl_WCTYPE_H Makefile.am: -nodist_pkgincludedir_HEADERS += wctype.h +nodist_pkginclude_HEADERS += wctype.h BUILT_SOURCES += wctype.h -- 2.39.5