From: Paul Eggert Date: Thu, 21 Jun 2007 17:08:44 +0000 (+0000) Subject: * m4/fchdir.m4 (gl_FUNC_FCHDIR): Likewise. X-Git-Tag: cvs-readonly~220 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=73f2a1c055c8dfa46d1a4db04a841d952e11c6a0;p=gnulib.git * m4/fchdir.m4 (gl_FUNC_FCHDIR): Likewise. * m4/iconv_h.m4 (gl_ICONV_H): Likewise. * m4/locale_h.m4 (gl_LOCALE_H): Likewise. * m4/netinet_in_h.m4 (gl_HEADER_NETINET_IN): Likewise. * m4/sys_select_h.m4 (gl_HEADER_SYS_SELECT): Likewise. * m4/sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Likewise. * m4/sysexits.m4 (gl_SYSEXITS): Likewise. SCALAR(0x828a248) * lib/dirent_.h: Likewise. * lib/iconv_.h: Likewise. * lib/locale_.h: Likewise. * lib/netinet_in_.h: Likewise. * lib/sys_select_.h: Likewise. * lib/sys_socket_.h: Likewise. * lib/sysexits_.h: Likewise. * modules/fchdir: Likewise. * modules/iconv_open: Likewise. * modules/locale: Likewise. * modules/netinet_in: Likewise. * modules/sys_select: Likewise. * modules/sys_socket: Likewise. * modules/sysexits: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 53fbf2320..a7d5787fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,17 +10,24 @@ (gl_CHECK_NEXT_HEADERS): New macro. * m4/fcntl_h.m4 (gl_FCNTL_H): use gl_CHECK_NEXT_HEADERS instead of the obsolescent gl_ABSOLUTE_HEADER. + * m4/fchdir.m4 (gl_FUNC_FCHDIR): Likewise. * m4/float_h.m4 (gl_FLOAT_H): Likewise. + * m4/iconv_h.m4 (gl_ICONV_H): Likewise. * m4/inttypes.m4 (gl_INTTYPES_H): Likewise. + * m4/locale_h.m4 (gl_LOCALE_H): Likewise. * m4/math_h.m4 (gl_MATH_H): Likewise. + * m4/netinet_in_h.m4 (gl_HEADER_NETINET_IN): Likewise. * m4/search_h.m4 (gl_SEARCH_H): Likewise. * m4/signal_h.m4 (gl_SIGNAL_H): Likewise. * m4/stdint.m4 (gl_STDINT_H): Likewise. * m4/stdio_h.m4 (gl_STDIO_H): Likewise. * m4/stdlib_h.m4 (gl_STDLIB_H): Likewise. * m4/string_h.m4 (gl_HEADER_STRING_H_BODY): Likewise. + * m4/sys_select_h.m4 (gl_HEADER_SYS_SELECT): Likewise. + * m4/sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Likewise. * m4/sys_stat_h.m4 (gl_HEADER_SYS_STAT_H): Likewise. * m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_BODY): Likewise. + * m4/sysexits.m4 (gl_SYSEXITS): Likewise. * m4/time_h.m4 (gl_HEADER_TIME_H_BODY): Likewise. * m4/unistd_h.m4 (gl_UNISTD_H): Likewise. * m4/wchar.m4 (gl_WCHAR_H): Likewise. @@ -47,21 +54,35 @@ * lib/unistd_.h: Likewise. * lib/wchar_.h: Likewise. * lib/wctype_.h: Likewise. + * lib/dirent_.h: Likewise. + * lib/iconv_.h: Likewise. + * lib/locale_.h: Likewise. + * lib/netinet_in_.h: Likewise. + * lib/sys_select_.h: Likewise. + * lib/sys_socket_.h: Likewise. + * lib/sysexits_.h: Likewise. * modules/fcntl (Depends-on): Depend on include_next, not absolute_header. (Makefile): Substitute INCLUDE_NEXT and NEXT_foo_H, not HAVE_INCLUDE_NEXT and ABSOLUTE_foo_H. + * modules/fchdir: Likewise. * modules/float: Likewise. + * modules/iconv_open: Likewise. * modules/inttypes: Likewise. + * modules/locale: Likewise. * modules/math: Likewise. + * modules/netinet_in: Likewise. * modules/search: Likewise. * modules/signal: Likewise. * modules/stdint: Likewise. * modules/stdio: Likewise. * modules/stdlib: Likewise. * modules/string: Likewise. + * modules/sys_select: Likewise. + * modules/sys_socket: Likewise. * modules/sys_stat: Likewise. * modules/sys_time: Likewise. + * modules/sysexits: Likewise. * modules/time: Likewise. * modules/unistd: Likewise. * modules/wchar: Likewise. diff --git a/lib/dirent_.h b/lib/dirent_.h index 94e44fc10..cd80bac9c 100644 --- a/lib/dirent_.h +++ b/lib/dirent_.h @@ -18,11 +18,7 @@ #ifndef _GL_DIRENT_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_DIRENT_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_DIRENT_H@ #ifndef _GL_DIRENT_H #define _GL_DIRENT_H diff --git a/lib/iconv_.h b/lib/iconv_.h index 745fe2ec6..72bac44c8 100644 --- a/lib/iconv_.h +++ b/lib/iconv_.h @@ -19,11 +19,7 @@ #ifndef _GL_ICONV_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_ICONV_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_ICONV_H@ #ifndef _GL_ICONV_H #define _GL_ICONV_H diff --git a/lib/locale_.h b/lib/locale_.h index 377d2b970..0b4c578c2 100644 --- a/lib/locale_.h +++ b/lib/locale_.h @@ -18,11 +18,7 @@ #ifndef _GL_LOCALE_H /* The include_next requires a split double-inclusion guard. */ -#if @HAVE_INCLUDE_NEXT@ -# include_next -#else -# include @ABSOLUTE_LOCALE_H@ -#endif +#@INCLUDE_NEXT@ @NEXT_LOCALE_H@ #ifndef _GL_LOCALE_H #define _GL_LOCALE_H diff --git a/lib/netinet_in_.h b/lib/netinet_in_.h index 2585d33e3..aa00e45ce 100644 --- a/lib/netinet_in_.h +++ b/lib/netinet_in_.h @@ -24,11 +24,7 @@ # include /* The include_next requires a split double-inclusion guard. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_NETINET_IN_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_NETINET_IN_H@ #endif diff --git a/lib/sys_select_.h b/lib/sys_select_.h index 0d575da95..056720262 100644 --- a/lib/sys_select_.h +++ b/lib/sys_select_.h @@ -24,11 +24,7 @@ # include /* The include_next requires a split double-inclusion guard. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_SYS_SELECT_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ #endif diff --git a/lib/sys_socket_.h b/lib/sys_socket_.h index c7eb64902..c25b6ab84 100644 --- a/lib/sys_socket_.h +++ b/lib/sys_socket_.h @@ -30,11 +30,7 @@ # include /* The include_next requires a split double-inclusion guard. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_SYS_SOCKET_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_SYS_SOCKET_H@ #endif diff --git a/lib/sysexits_.h b/lib/sysexits_.h index ba12aa29e..b65e0ccc3 100644 --- a/lib/sysexits_.h +++ b/lib/sysexits_.h @@ -30,11 +30,7 @@ # endif /* The include_next requires a split double-inclusion guard. */ -# if @HAVE_INCLUDE_NEXT@ -# include_next -# else -# include @ABSOLUTE_SYSEXITS_H@ -# endif +# @INCLUDE_NEXT@ @NEXT_SYSEXITS_H@ /* HP-UX 11 ends at EX_NOPERM. */ # ifndef EX_CONFIG diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index 58c933cf3..fd170d294 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,4 +1,4 @@ -# fchdir.m4 serial 3 +# fchdir.m4 serial 4 dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,11 @@ AC_DEFUN([gl_FUNC_FCHDIR], gl_PREREQ_FCHDIR AC_DEFINE([FCHDIR_REPLACEMENT], 1, [Define if gnulib's fchdir() replacement is used.]) - gl_ABSOLUTE_HEADER([dirent.h]) - ABSOLUTE_DIRENT_H=\"$gl_cv_absolute_dirent_h\" + gl_CHECK_NEXT_HEADERS([dirent.h]) DIRENT_H='dirent.h' else DIRENT_H= fi - AC_SUBST([ABSOLUTE_DIRENT_H]) AC_SUBST([DIRENT_H]) ]) diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index a4324f96b..a6479616a 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,4 +1,4 @@ -# iconv_h.m4 serial 1 +# iconv_h.m4 serial 2 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,9 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_ICONV_H], [ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - gl_ABSOLUTE_HEADER([iconv.h]) - ABSOLUTE_ICONV_H=\"$gl_cv_absolute_iconv_h\" - AC_SUBST([ABSOLUTE_ICONV_H]) + gl_CHECK_NEXT_HEADERS([iconv.h]) ICONV_H= AC_SUBST([ICONV_H]) ]) diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index 57f2f3aa4..2bf5abcca 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,4 +1,4 @@ -# locale_h.m4 serial 1 +# locale_h.m4 serial 2 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,9 +15,7 @@ int x = LC_MESSAGES;], [], if test $gl_cv_header_working_locale_h = yes; then LOCALE_H= else - gl_ABSOLUTE_HEADER([locale.h]) - ABSOLUTE_LOCALE_H=\"$gl_cv_absolute_locale_h\" - AC_SUBST([ABSOLUTE_LOCALE_H]) + gl_CHECK_NEXT_HEADERS([locale.h]) LOCALE_H=locale.h fi AC_SUBST([LOCALE_H]) diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index 966bfe6a1..096be740d 100644 --- a/m4/netinet_in_h.m4 +++ b/m4/netinet_in_h.m4 @@ -1,4 +1,4 @@ -# netinet_in_h.m4 serial 2 +# netinet_in_h.m4 serial 3 dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -18,9 +18,7 @@ AC_DEFUN([gl_HEADER_NETINET_IN], else NETINET_IN_H='netinet/in.h' AC_CHECK_HEADERS([netinet/in.h]) - gl_ABSOLUTE_HEADER([netinet/in.h]) - ABSOLUTE_NETINET_IN_H=\"$gl_cv_absolute_netinet_in_h\" - AC_SUBST([ABSOLUTE_NETINET_IN_H]) + gl_CHECK_NEXT_HEADERS([netinet/in.h]) if test $ac_cv_header_netinet_in_h = yes; then HAVE_NETINET_IN_H=1 else diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 7fe67dff8..1d48bcc9b 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,4 +1,4 @@ -# sys_select_h.m4 serial 2 +# sys_select_h.m4 serial 3 dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,10 +17,7 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], SYS_SELECT_H='' else SYS_SELECT_H='sys/select.h' - AC_CHECK_HEADERS([sys/select.h]) - gl_ABSOLUTE_HEADER([sys/select.h]) - ABSOLUTE_SYS_SELECT_H=\"$gl_cv_absolute_sys_select_h\" - AC_SUBST([ABSOLUTE_SYS_SELECT_H]) + gl_CHECK_NEXT_HEADERS([sys/select.h]) if test $ac_cv_header_sys_select_h = yes; then HAVE_SYS_SELECT_H=1 else diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index ce5acf6e2..d9659c2d7 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 3 +# sys_socket_h.m4 serial 4 dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,10 +20,7 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], else SYS_SOCKET_H='sys/socket.h' - AC_CHECK_HEADERS([sys/socket.h]) - gl_ABSOLUTE_HEADER([sys/socket.h]) - ABSOLUTE_SYS_SOCKET_H=\"$gl_cv_absolute_sys_socket_h\" - AC_SUBST([ABSOLUTE_SYS_SOCKET_H]) + gl_CHECK_NEXT_HEADERS([sys/socket.h]) if test $ac_cv_header_sys_socket_h = yes; then HAVE_SYS_SOCKET_H=1 HAVE_WINSOCK2_H=0 diff --git a/m4/sysexits.m4 b/m4/sysexits.m4 index 17d5aeef0..bbd6973c2 100644 --- a/m4/sysexits.m4 +++ b/m4/sysexits.m4 @@ -1,4 +1,4 @@ -# sysexits.m4 serial 3 +# sysexits.m4 serial 4 dnl Copyright (C) 2003, 2005, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,8 +9,7 @@ AC_DEFUN([gl_SYSEXITS], AC_CHECK_HEADERS_ONCE([sysexits.h]) if test $ac_cv_header_sysexits_h = yes; then HAVE_SYSEXITS_H=1 - gl_ABSOLUTE_HEADER([sysexits.h]) - ABSOLUTE_SYSEXITS_H=\"$gl_cv_absolute_sysexits_h\" + gl_CHECK_NEXT_HEADERS([sysexits.h]) AC_TRY_COMPILE([#include ], [switch (0) { @@ -40,6 +39,5 @@ AC_DEFUN([gl_SYSEXITS], SYSEXITS_H=sysexits.h fi AC_SUBST([HAVE_SYSEXITS_H]) - AC_SUBST([ABSOLUTE_SYSEXITS_H]) AC_SUBST([SYSEXITS_H]) ]) diff --git a/modules/fchdir b/modules/fchdir index c2b94b0f6..ae562e72c 100644 --- a/modules/fchdir +++ b/modules/fchdir @@ -7,7 +7,7 @@ lib/dirent_.h m4/fchdir.m4 Depends-on: -absolute-header +include_next dup2 fcntl unistd @@ -27,8 +27,8 @@ BUILT_SOURCES += $(DIRENT_H) dirent.h: dirent_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_DIRENT_H''@|$(ABSOLUTE_DIRENT_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ < $(srcdir)/dirent_.h; \ } > $@-t diff --git a/modules/iconv_open b/modules/iconv_open index 7525ed1f5..8aa5e8f13 100644 --- a/modules/iconv_open +++ b/modules/iconv_open @@ -12,7 +12,7 @@ m4/iconv_h.m4 m4/iconv_open.m4 Depends-on: -absolute-header +include_next iconv c-ctype @@ -28,8 +28,8 @@ BUILT_SOURCES += $(ICONV_H) iconv.h: iconv_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_ICONV_H''@|$(ABSOLUTE_ICONV_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ < $(srcdir)/iconv_.h; \ } > $@-t diff --git a/modules/locale b/modules/locale index 74bcea178..099c4e8c4 100644 --- a/modules/locale +++ b/modules/locale @@ -6,7 +6,7 @@ lib/locale_.h m4/locale_h.m4 Depends-on: -absolute-header +include_next configure.ac: gl_LOCALE_H @@ -19,8 +19,8 @@ BUILT_SOURCES += $(LOCALE_H) locale.h: locale_.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''ABSOLUTE_LOCALE_H''@|$(ABSOLUTE_LOCALE_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ < $(srcdir)/locale_.h; \ } > $@-t mv $@-t $@ diff --git a/modules/netinet_in b/modules/netinet_in index a4eeb438f..1a7fc7be0 100644 --- a/modules/netinet_in +++ b/modules/netinet_in @@ -6,7 +6,7 @@ lib/netinet_in_.h m4/netinet_in_h.m4 Depends-on: -absolute-header +include_next sys_socket configure.ac: @@ -22,8 +22,8 @@ netinet/in.h: @MKDIR_P@ netinet rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_NETINET_IN_H''@|$(ABSOLUTE_NETINET_IN_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ < $(srcdir)/netinet_in_.h; \ } > $@-t diff --git a/modules/sys_select b/modules/sys_select index 68f79185b..b9a41e04f 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -6,7 +6,7 @@ lib/sys_select_.h m4/sys_select_h.m4 Depends-on: -absolute-header +include_next sys_socket configure.ac: @@ -22,8 +22,8 @@ sys/select.h: @MKDIR_P@ sys rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_SYS_SELECT_H''@|$(ABSOLUTE_SYS_SELECT_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ < $(srcdir)/sys_select_.h; \ } > $@-t diff --git a/modules/sys_socket b/modules/sys_socket index 3a6cd455a..0ea6c1af8 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -7,7 +7,7 @@ m4/sys_socket_h.m4 m4/sockpfaf.m4 Depends-on: -absolute-header +include_next configure.ac: gl_HEADER_SYS_SOCKET @@ -21,8 +21,8 @@ BUILT_SOURCES += $(SYS_SOCKET_H) sys/socket.h: sys_socket_.h @MKDIR_P@ sys { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''ABSOLUTE_SYS_SOCKET_H''@|$(ABSOLUTE_SYS_SOCKET_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ diff --git a/modules/sysexits b/modules/sysexits index cb68f8eed..955f91504 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -6,7 +6,7 @@ lib/sysexits_.h m4/sysexits.m4 Depends-on: -absolute-header +include_next configure.ac: gl_SYSEXITS @@ -19,8 +19,8 @@ BUILT_SOURCES += $(SYSEXITS_H) sysexits.h: sysexits_.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ - -e 's|@''ABSOLUTE_SYSEXITS_H''@|$(ABSOLUTE_SYSEXITS_H)|g' \ - -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ + -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ + -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \ < $(srcdir)/sysexits_.h; \ } > $@-t mv -f $@-t $@