Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14108:873a3371d1d2
spell the pkginclude directory correctly.
line wrap: on
line diff
--- a/gnulib-tool +++ b/gnulib-tool @@ -2872,8 +2872,8 @@ 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 @@ 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 @@ 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
--- a/libposix/.gitignore +++ b/libposix/.gitignore @@ -46,3 +46,6 @@ /tests/test-* unused-parameter.h warn-on-use.h +/tests +/tmp +
--- a/libposix/bootstrap +++ b/libposix/bootstrap @@ -2,29 +2,58 @@ PATH=..:$PATH +mkdir tmp +mkdir tmp/modules + + { echo alloca + posix-modules + } | sort -u > tmp/posix-list + + 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: + + 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 --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 +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 - -# 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 - - # Run autotools. autoreconf --force --install --verbose --symlink
--- a/libposix/lib/Makefile.am +++ b/libposix/lib/Makefile.am @@ -3,8 +3,8 @@ EXTRA_DIST = EXTRA_HEADERS = -nodist_include_HEADERS = -nobase_nodist_include_HEADERS = +nodist_pkginclude_HEADERS = +nobase_nodist_pkginclude_HEADERS = CLEANFILES = MOSTLYCLEANDIRS =
--- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -13,7 +13,7 @@ gl_FUNC_ALLOCA Makefile.am: -nodist_pkgincludedir_HEADERS += $(ALLOCA_H) +nodist_pkginclude_HEADERS += $(ALLOCA_H) EXTRA_HEADERS += alloca.h BUILT_SOURCES += $(ALLOCA_H)
--- a/modules/arg-nonnull +++ b/modules/arg-nonnull @@ -12,7 +12,7 @@ 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
--- a/modules/argz +++ b/modules/argz @@ -18,7 +18,7 @@ gl_FUNC_ARGZ Makefile.am: -nodist_pkgincludedir_HEADERS += $(ARGZ_H) +nodist_pkginclude_HEADERS += $(ARGZ_H) EXTRA_HEADERS += argz.h BUILT_SOURCES += $(ARGZ_H)
--- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -16,7 +16,7 @@ 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
--- a/modules/byteswap +++ b/modules/byteswap @@ -11,7 +11,7 @@ gl_BYTESWAP Makefile.am: -nodist_pkgincludedir_HEADERS += $(BYTESWAP_H) +nodist_pkginclude_HEADERS += $(BYTESWAP_H) EXTRA_HEADERS += byteswap.h BUILT_SOURCES += $(BYTESWAP_H)
--- a/modules/c++defs +++ b/modules/c++defs @@ -12,7 +12,7 @@ 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
--- a/modules/ctype +++ b/modules/ctype @@ -14,7 +14,7 @@ gl_CTYPE_H Makefile.am: -nodist_pkgincludedir_HEADERS += ctype.h +nodist_pkginclude_HEADERS += ctype.h BUILT_SOURCES += ctype.h
--- a/modules/dirent +++ b/modules/dirent @@ -16,7 +16,7 @@ gl_DIRENT_H Makefile.am: -nodist_pkgincludedir_HEADERS += dirent.h +nodist_pkginclude_HEADERS += dirent.h BUILT_SOURCES += dirent.h
--- a/modules/errno +++ b/modules/errno @@ -12,7 +12,7 @@ gl_HEADER_ERRNO_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(ERRNO_H) +nodist_pkginclude_HEADERS += $(ERRNO_H) EXTRA_HEADERS += errno.h BUILT_SOURCES += $(ERRNO_H)
--- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -18,7 +18,7 @@ gl_FCNTL_H Makefile.am: -nodist_pkgincludedir_HEADERS += fcntl.h +nodist_pkginclude_HEADERS += fcntl.h BUILT_SOURCES += fcntl.h
--- a/modules/float +++ b/modules/float @@ -12,7 +12,7 @@ gl_FLOAT_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(FLOAT_H) +nodist_pkginclude_HEADERS += $(FLOAT_H) EXTRA_HEADERS += float.h BUILT_SOURCES += $(FLOAT_H)
--- a/modules/fnmatch +++ b/modules/fnmatch @@ -24,7 +24,7 @@ gl_FUNC_FNMATCH_POSIX Makefile.am: -nodist_pkgincludedir_HEADERS += $(FNMATCH_H) +nodist_pkginclude_HEADERS += $(FNMATCH_H) EXTRA_HEADERS += fnmatch.h BUILT_SOURCES += $(FNMATCH_H)
--- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -19,7 +19,7 @@ gl_FUNC_GETOPT_POSIX Makefile.am: -nodist_pkgincludedir_HEADERS += $(GETOPT_H) +nodist_pkginclude_HEADERS += $(GETOPT_H) EXTRA_HEADERS += getopt.h BUILT_SOURCES += $(GETOPT_H)
--- a/modules/glob +++ b/modules/glob @@ -30,7 +30,7 @@ gl_GLOB Makefile.am: -nodist_pkgincludedir_HEADERS += $(GLOB_H) +nodist_pkginclude_HEADERS += $(GLOB_H) EXTRA_HEADERS += glob.h BUILT_SOURCES += $(GLOB_H)
--- a/modules/iconv-h +++ b/modules/iconv-h @@ -15,7 +15,7 @@ gl_ICONV_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(ICONV_H) +nodist_pkginclude_HEADERS += $(ICONV_H) EXTRA_HEADERS += iconv.h BUILT_SOURCES += $(ICONV_H)
--- 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_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
--- a/modules/inttypes +++ b/modules/inttypes @@ -17,7 +17,7 @@ gl_INTTYPES_H Makefile.am: -nodist_pkgincludedir_HEADERS += inttypes.h +nodist_pkginclude_HEADERS += inttypes.h BUILT_SOURCES += inttypes.h
--- a/modules/langinfo +++ b/modules/langinfo @@ -15,7 +15,7 @@ gl_LANGINFO_H Makefile.am: -nodist_pkgincludedir_HEADERS += langinfo.h +nodist_pkginclude_HEADERS += langinfo.h BUILT_SOURCES += langinfo.h
deleted file mode 100644 --- 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
--- a/modules/link-warning +++ b/modules/link-warning @@ -12,7 +12,7 @@ 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
--- a/modules/locale +++ b/modules/locale @@ -17,7 +17,7 @@ gl_LOCALE_H Makefile.am: -nodist_pkgincludedir_HEADERS += locale.h +nodist_pkginclude_HEADERS += locale.h BUILT_SOURCES += locale.h
--- a/modules/math +++ b/modules/math @@ -15,7 +15,7 @@ gl_MATH_H Makefile.am: -nodist_pkgincludedir_HEADERS += math.h +nodist_pkginclude_HEADERS += math.h BUILT_SOURCES += math.h
--- a/modules/netdb +++ b/modules/netdb @@ -16,7 +16,7 @@ gl_HEADER_NETDB Makefile.am: -nodist_pkgincludedir_HEADERS += netdb.h +nodist_pkginclude_HEADERS += netdb.h BUILT_SOURCES += netdb.h
--- a/modules/netinet_in +++ b/modules/netinet_in @@ -14,7 +14,7 @@ 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)
--- a/modules/poll-h +++ b/modules/poll-h @@ -15,7 +15,7 @@ gl_POLL_H Makefile.am: -nodist_pkgincludedir_HEADERS += poll.h +nodist_pkginclude_HEADERS += poll.h BUILT_SOURCES += poll.h
--- a/modules/pthread +++ b/modules/pthread @@ -13,7 +13,7 @@ gl_PTHREAD_CHECK Makefile.am: -nodist_pkgincludedir_HEADERS += $(PTHREAD_H) +nodist_pkginclude_HEADERS += $(PTHREAD_H) EXTRA_HEADERS += pthread.h BUILT_SOURCES += $(PTHREAD_H)
--- a/modules/pty +++ b/modules/pty @@ -14,7 +14,7 @@ gl_PTY_H Makefile.am: -nodist_pkgincludedir_HEADERS += pty.h +nodist_pkginclude_HEADERS += pty.h BUILT_SOURCES += pty.h
--- a/modules/sched +++ b/modules/sched @@ -12,7 +12,7 @@ gl_SCHED_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(SCHED_H) +nodist_pkginclude_HEADERS += $(SCHED_H) EXTRA_HEADERS += sched.h BUILT_SOURCES += $(SCHED_H)
--- a/modules/search +++ b/modules/search @@ -15,7 +15,7 @@ gl_SEARCH_H Makefile.am: -nodist_pkgincludedir_HEADERS += search.h +nodist_pkginclude_HEADERS += search.h BUILT_SOURCES += search.h
--- a/modules/selinux-h +++ b/modules/selinux-h @@ -18,7 +18,7 @@ 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
--- a/modules/signal +++ b/modules/signal @@ -15,7 +15,7 @@ gl_SIGNAL_H Makefile.am: -nodist_pkgincludedir_HEADERS += signal.h +nodist_pkginclude_HEADERS += signal.h BUILT_SOURCES += signal.h
--- a/modules/spawn +++ b/modules/spawn @@ -16,7 +16,7 @@ gl_SPAWN_H Makefile.am: -nodist_pkgincludedir_HEADERS += spawn.h +nodist_pkginclude_HEADERS += spawn.h BUILT_SOURCES += spawn.h
--- a/modules/stdarg +++ b/modules/stdarg @@ -19,7 +19,7 @@ gl_STDARG_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDARG_H) +nodist_pkginclude_HEADERS += $(STDARG_H) EXTRA_HEADERS += stdarg.h BUILT_SOURCES += $(STDARG_H)
--- a/modules/stdbool +++ b/modules/stdbool @@ -12,7 +12,7 @@ AM_STDBOOL_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDBOOL_H) +nodist_pkginclude_HEADERS += $(STDBOOL_H) EXTRA_HEADERS += stdbool.h BUILT_SOURCES += $(STDBOOL_H)
--- a/modules/stddef +++ b/modules/stddef @@ -13,7 +13,7 @@ gl_STDDEF_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDDEF_H) +nodist_pkginclude_HEADERS += $(STDDEF_H) EXTRA_HEADERS += stddef.h BUILT_SOURCES += $(STDDEF_H)
--- a/modules/stdint +++ b/modules/stdint @@ -20,7 +20,7 @@ gl_STDINT_H Makefile.am: -nodist_pkgincludedir_HEADERS += $(STDINT_H) +nodist_pkginclude_HEADERS += $(STDINT_H) EXTRA_HEADERS += stdint.h BUILT_SOURCES += $(STDINT_H)
--- a/modules/stdio +++ b/modules/stdio @@ -19,7 +19,7 @@ gl_STDIO_H Makefile.am: -nodist_pkgincludedir_HEADERS += stdio.h +nodist_pkginclude_HEADERS += stdio.h BUILT_SOURCES += stdio.h
--- a/modules/stdlib +++ b/modules/stdlib @@ -18,7 +18,7 @@ gl_STDLIB_H Makefile.am: -nodist_pkgincludedir_HEADERS += stdlib.h +nodist_pkginclude_HEADERS += stdlib.h BUILT_SOURCES += stdlib.h
--- a/modules/string +++ b/modules/string @@ -17,7 +17,7 @@ gl_HEADER_STRING_H Makefile.am: -nodist_pkgincludedir_HEADERS += string.h +nodist_pkginclude_HEADERS += string.h BUILT_SOURCES += string.h
--- a/modules/strings +++ b/modules/strings @@ -14,7 +14,7 @@ gl_HEADER_STRINGS_H Makefile.am: -nodist_pkgincludedir_HEADERS += strings.h +nodist_pkginclude_HEADERS += strings.h BUILT_SOURCES += strings.h
--- a/modules/sys_file +++ b/modules/sys_file @@ -14,7 +14,7 @@ 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
--- a/modules/sys_ioctl +++ b/modules/sys_ioctl @@ -16,7 +16,7 @@ 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
--- a/modules/sys_select +++ b/modules/sys_select @@ -17,7 +17,7 @@ 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
--- a/modules/sys_socket +++ b/modules/sys_socket @@ -20,7 +20,7 @@ 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
--- a/modules/sys_stat +++ b/modules/sys_stat @@ -18,7 +18,7 @@ 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
--- a/modules/sys_time +++ b/modules/sys_time @@ -16,7 +16,7 @@ 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
--- a/modules/sys_times +++ b/modules/sys_times @@ -15,7 +15,7 @@ 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
--- a/modules/sys_utsname +++ b/modules/sys_utsname @@ -15,7 +15,7 @@ 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
--- a/modules/sys_wait +++ b/modules/sys_wait @@ -15,7 +15,7 @@ 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
--- a/modules/sysexits +++ b/modules/sysexits @@ -12,7 +12,7 @@ gl_SYSEXITS Makefile.am: -nodist_pkgincludedir_HEADERS += $(SYSEXITS_H) +nodist_pkginclude_HEADERS += $(SYSEXITS_H) EXTRA_HEADERS += sysexits.h BUILT_SOURCES += $(SYSEXITS_H)
--- a/modules/termios +++ b/modules/termios @@ -14,7 +14,7 @@ gl_TERMIOS_H Makefile.am: -nodist_pkgincludedir_HEADERS += termios.h +nodist_pkginclude_HEADERS += termios.h BUILT_SOURCES += termios.h
--- a/modules/time +++ b/modules/time @@ -17,7 +17,7 @@ gl_HEADER_TIME_H Makefile.am: -nodist_pkgincludedir_HEADERS += time.h +nodist_pkginclude_HEADERS += time.h BUILT_SOURCES += time.h
--- a/modules/unistd +++ b/modules/unistd @@ -16,7 +16,7 @@ gl_UNISTD_H Makefile.am: -nodist_pkgincludedir_HEADERS += unistd.h +nodist_pkginclude_HEADERS += unistd.h BUILT_SOURCES += unistd.h
--- a/modules/unitypes +++ b/modules/unitypes @@ -12,7 +12,7 @@ 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)
--- a/modules/unused-parameter +++ b/modules/unused-parameter @@ -12,7 +12,7 @@ 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
--- a/modules/warn-on-use +++ b/modules/warn-on-use @@ -13,7 +13,7 @@ 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