]> Savannah Git Hosting - gnulib.git/commitdiff
spell the pkginclude directory correctly.
authorBruce Korb <bkorb@gnu.org>
Tue, 16 Nov 2010 21:34:36 +0000 (13:34 -0800)
committerBruce Korb <bkorb@gnu.org>
Tue, 16 Nov 2010 21:34:36 +0000 (13:34 -0800)
62 files changed:
gnulib-tool
libposix/.gitignore
libposix/bootstrap
libposix/lib/Makefile.am
modules/alloca-opt
modules/arg-nonnull
modules/argz
modules/arpa_inet
modules/byteswap
modules/c++defs
modules/ctype
modules/dirent
modules/errno
modules/fcntl-h
modules/float
modules/fnmatch
modules/getopt-posix
modules/glob
modules/iconv-h
modules/iconv_open
modules/inttypes
modules/langinfo
modules/libposix [deleted file]
modules/link-warning
modules/locale
modules/math
modules/netdb
modules/netinet_in
modules/poll-h
modules/pthread
modules/pty
modules/sched
modules/search
modules/selinux-h
modules/signal
modules/spawn
modules/stdarg
modules/stdbool
modules/stddef
modules/stdint
modules/stdio
modules/stdlib
modules/string
modules/strings
modules/sys_file
modules/sys_ioctl
modules/sys_select
modules/sys_socket
modules/sys_stat
modules/sys_time
modules/sys_times
modules/sys_utsname
modules/sys_wait
modules/sysexits
modules/termios
modules/time
modules/unistd
modules/unitypes
modules/unused-parameter
modules/warn-on-use
modules/wchar
modules/wctype

index ab0b3783b2a093a1b2f8954650dba6f075efad87..b7d7614484c1fbd0780880f1fa268ba1ebd47385 100755 (executable)
@@ -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
index b078d37a6b2e6848f29aac9f6d13f0018bf9f100..873ceeb5c4ef265489cef1d30d7132eb03fb807f 100644 (file)
@@ -46,3 +46,6 @@ stamp-h1
 /tests/test-*
 unused-parameter.h
 warn-on-use.h
+/tests
+/tmp
+
index 987bd31026cf24f3f53749f9b650744744b304c9..10c37a92f7869333c4d00eda5af919a7b2ea2be4 100755 (executable)
@@ -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
index 9be48fce60b4e9ffa7fe70cacf0a0a529908c5e2..0a31f4e5ea3cbe55325f66731b622717e32e9b96 100644 (file)
@@ -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 =
index 9424453753159555b77f00b77364dea9bbf5ea3a..4ae08b0dd8ef1ba4e6d9189351bbd94f15041cef 100644 (file)
@@ -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)
index bf7c376ae9b061d0dd88646ce22dc9d3393e4a77..37c5ea663d961fde5d17a58510d8db7b501b1c5e 100644 (file)
@@ -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
index 765451723558118ac7c0592c901726f4e9e9fc0a..1a33f37d4019fd1ff3e31df90f886a8c3a1e6488 100644 (file)
@@ -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)
index 9d9f624c34ebafa8225645fd528c84b3ad8cfb78..0588280c47aef20a448956185ebc104eb6c2b1d4 100644 (file)
@@ -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
 
index a2c85a96b684ceb8824cf1ffec20d9b661e99868..d16af57f6aea1186535831b7a46ef09215883d37 100644 (file)
@@ -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)
index b955732b36c57f09f12b0a013302d030f6a5b0bb..9cd5a8b9d659e76e2a4d58ee2bf074a56533f727 100644 (file)
@@ -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
index 2ffaefda02b71280bff47e8bf317ea634d3a1d3e..e37e622c64335d0e3c4d99ac614c64b2293745eb 100644 (file)
@@ -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
 
index 5a02c4a7aa790958f4433877744ecc2a32954bac..094a84e2b6135d204ec5d5db7bf3f51cb3876a38 100644 (file)
@@ -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
 
index fb06c61e3225c21305134baf79e077f62c739a2e..221bebf0de67afcc2959d2b0d88e05607d9c7c27 100644 (file)
@@ -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)
index 098e3a0f3cbe19ca87d9a14583c1c8da56108083..6a33fc7ac042a6a98e961c81466855c8713f949d 100644 (file)
@@ -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
 
index 4efa719bd0555f3947763483fde5feaeffae4fc2..004d2bf42ae799a55f7a99af0bef5ea29b189fab 100644 (file)
@@ -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)
index e658401aaeed63f38dee54de633bf9fa4296a485..cff8bad5a00336566919324b455dcfa5fbf55da0 100644 (file)
@@ -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)
index 9e456aab742b9177ce4a2f72aa8524aaf86c7050..93d7fccf103095ec9a3ae7dc8af15d94527ed107 100644 (file)
@@ -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)
index 241b2b181df85e9a588b07553449ea38fb923e7d..beaf476c118b8b373cf6d6dd23fe346bb1e69575 100644 (file)
@@ -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)
index ceab90337d7ec59216904f6e12082c4e382befb2..7a01af9a8b6ee9a7fe85c558ef15599992c19401 100644 (file)
@@ -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)
index 7f8b910c63cd0a71b48027021ac44b502ef56686..194440b046320aa7166b900d7df4258b0910c3fc 100644 (file)
@@ -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
index a8b6e95bd323ff3a23bb21ff051f8fa756ec4ba7..991fe4e1a3cbb7a50046814456a6b0ae9d7b7b10 100644 (file)
@@ -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
 
index e22ece2883b3ad76551f2d827d98a4c79d31019a..e864c91a89bdd53cff133d7de1a881df2ae66e28 100644 (file)
@@ -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 (file)
index f43874d..0000000
+++ /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
index 7e78e194685d17f37113dc349a23c2c8c303be15..f4d04bd6ed2018bea6d9ec1d8c80a3ca5b663704 100644 (file)
@@ -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
index 9f282ab5f89f009f14fbd0487b4a85795b0932fc..298b924966d1eb8083eda2c87a18239f3d84acfb 100644 (file)
@@ -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
 
index 028811540bd87b350485fb2b893ed65009fc0f6d..dfc677aadddb321d6ff861bac24c76aaf83afc00 100644 (file)
@@ -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
 
index 9609b56a4930fb0337c47fb26df344228d8dcdbf..49f58f15d37df1e39c2685fee9621705ca9168e4 100644 (file)
@@ -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
 
index d76a6ba826dcb7069f5727d6479e165ba8b5af69..28b80c8e276de5a80dddc58320d14e1de7f3d875 100644 (file)
@@ -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)
index 601ca930d7f87edb059c0ecb2c9f463fb1ff1d59..8fc15cdb1a84517a9987129b0d4e7bb71bc56188 100644 (file)
@@ -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
 
index e53ca3c1c8c81548673937ed7a06b6f4449c5385..7aaaffac40ed189f43b824f00b63bb2857f53f39 100644 (file)
@@ -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)
index 03cdd7740c62b2d1aa90c3a3be302bf66ff1c61c..f490b344b81f9cf30057b28f111242291406e690 100644 (file)
@@ -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
 
index 01abb9e3f04396766957c0168b1f38582db59954..128ec35eecd1c60a806872bc8a94603d30676068 100644 (file)
@@ -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)
index 812f79262f990b829bc2267d420c9937496b06ca..3f7ecc060c1cafd223e91f139ab41c65b8d503da 100644 (file)
@@ -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
 
index 89e9a0c6c1b4b3e197c71019f318e5cdacbca734..589729df3a93c31a48e184d40cb6121c4d5862d2 100644 (file)
@@ -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
 
index c4f70f29d9d7ba024a34e9337dbada9590f81790..ed9b14737e8357db912249d713a0da30158264d2 100644 (file)
@@ -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
 
index 64ae6845d233a6ba62d39cb4a5168e9cea880f73..eb0d4c13a602aa7375138aca1b67dc54adac1745 100644 (file)
@@ -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
 
index 463913cf12267d3f9b1468a835d0aebab9749807..105a54c52deac330bb123042462070ee90949ab1 100644 (file)
@@ -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)
index c4b840e593eabb6983879e54a5db240669eecc7b..5c1fe3ce36619513cc5da8c724a1d46bec87b847 100644 (file)
@@ -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)
index 6817984e682599edd07fe7a23de095be5281ad18..62e874a3cffd55557e6d0cfcb5d18453fede25f9 100644 (file)
@@ -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)
index 83b84b8048ec156fb4069ecea33e1557fa6b7e3e..bbf208a5b3e4572d7d65eef8a218ebf9ca667180 100644 (file)
@@ -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)
index ca1d05ba15d868be2dcf63e1e2aa681957d7b6dc..33022d5054def8031b29271007a937f67e0af4b9 100644 (file)
@@ -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
 
index 0e858ac912a925549bcc068ab6f24024e6ac1b86..b277afee6d6b0d08bf148b18cc3004f2036dc1f9 100644 (file)
@@ -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
 
index 5f85af834bf3c39aa8dc96de32195f4e7cd7672a..d57b4ef8da58035717f55d449c704a6ab426ae60 100644 (file)
@@ -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
 
index d3b222b63eee082ac23c0201f286d5e3079b42e7..e5ef663942f3427e728c7fc57726e9fd73a503fa 100644 (file)
@@ -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
 
index ad15ddb242f6b6434fe0d2e3fa987cd544a67539..27d87ec9f4e56dedff4b8238d1467fc7fc094c7d 100644 (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
 
index 758f215caab98366435251983281326350490136..f5051be2e00922366b8019edd89f8a710266463b 100644 (file)
@@ -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
 
index bd68b894027b738a47650c2f625d6ba7834ff1b5..9c24a6d639f46941ee7d59a965b71281acaccd18 100644 (file)
@@ -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
 
index 7243f0b042619fc9edb967e04e8be375a12915f3..3987eb4e3211bb426e9daaabf340cc7633b2def6 100644 (file)
@@ -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
 
index 9e0fdcead389ac5d37e9bb2f139830c5a0e776ef..ba70116eac8d63d23ec46002d10e267526161fd2 100644 (file)
@@ -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
 
index f925e85a07ed63e4d75b397050fbbfb00d00624b..f4dfa19b90b7aa17a8077e13fd6dcb7a9da39d05 100644 (file)
@@ -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
 
index 1955e6c890d4fcd2ab23af16b98e31a6df68ae5f..2ce8e73e2f48d9f7b2ee2c2a27339c7b4b0adb94 100644 (file)
@@ -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
 
index 51c1913d290fa0058bc0dd9e166901c51de45662..ff60b4ed5fab806f7374a1f33826a709bb319fc3 100644 (file)
@@ -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
 
index 9e418f398818faf1111107b039cf82191fc4fbfc..ad42623fe7cedf3416d654f8b9f1c98d57e1e237 100644 (file)
@@ -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
 
index 0c247993081be66d6b43a1399e19fe51b6d65ffb..191ba60ca93696a7087a5442e7c5651b31d7ae4d 100644 (file)
@@ -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)
index 41731813b90b703e790bfaecf7c73ccc11a2f823..34180fb1a7c11b880735b232d08d7c04008f71ab 100644 (file)
@@ -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
 
index b946689a8655602696e6551e029482f361f5a149..d5b615cd5decb583c2d54050ade3279323899a2c 100644 (file)
@@ -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
 
index 5377703376be2adf5c77c3823de65a3692927e40..cb6ba7fb0f019a4977889d819aa895d85e3e9087 100644 (file)
@@ -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
 
index dcd3de66fda283ced572f2b89d3bd50c5a66d8e2..ed061de8dcca82e3bb28021e29173123a873451b 100644 (file)
@@ -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)
index 32a666a6a404a7827529c89402345c3eb62253d7..9a3d0d41cb91953c9dbd1a08cf6934f5f10b4357 100644 (file)
@@ -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
index e0c74a17cb94810c85b5c07c9c14a1636b94c37a..3cf3281b4be2767eabb8239bfc043cdeafb4472d 100644 (file)
@@ -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
index 3b24c5d6aec8d0c79d50e9672204e92a8ad6b8a0..8a700fc7e7e392aaacdedf8e508c5db5b60c7c92 100644 (file)
@@ -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
 
index 93b8873382517303396631af93737488ca14f6df..9f86e028cabafd9eaf894c2754f35864b7510bcc 100644 (file)
@@ -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