Rename sysexits_.h to sysexits.in.h.

diff --git a/ChangeLog b/ChangeLog
index 03f9716e45c7605d5ab4a3f2877f17760319f983..b3d15bff2ee8d4187031c6e324d9c5c3f606cbc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,9 @@
        * lib/sys_time.in.h: Renamed from lib/sys_time_.h.
        * modules/sys_time (Files, Makefile.am): Use sys_time.in.h instead of
        sys_time_.h.
+       * lib/sysexits.in.h: Renamed from lib/sysexits_.h.
+       * modules/sysexits (Files, Makefile.am): Use sysexits.in.h instead of
+       sysexits_.h.
 
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/sysexits.in.h b/lib/sysexits.in.h
new file mode 100644 (file)
index 0000000..b65e0cc
--- /dev/null
+++ b/lib/sysexits.in.h
@@ -0,0 +1,68 @@
+/* exit() exit codes for some BSD system programs.
+   Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+/* Written by Simon Josefsson based on sysexits(3) man page */
+
+#ifndef _GL_SYSEXITS_H
+
+#if @HAVE_SYSEXITS_H@
+
+/* IRIX 6.5 has an <unistd.h> that defines a macro EX_OK with a nonzero
+   value.  Override it.  See
+   <http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00361.html>  */
+# ifdef __sgi
+#  include <unistd.h>
+#  undef EX_OK
+# endif
+
+/* The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_SYSEXITS_H@
+
+/* HP-UX 11 <sysexits.h> ends at EX_NOPERM.  */
+# ifndef EX_CONFIG
+#  define EX_CONFIG 78
+# endif
+
+#endif
+
+#ifndef _GL_SYSEXITS_H
+#define _GL_SYSEXITS_H
+
+#if !@HAVE_SYSEXITS_H@
+
+# define EX_OK 0 /* same value as EXIT_SUCCESS */
+
+# define EX_USAGE 64
+# define EX_DATAERR 65
+# define EX_NOINPUT 66
+# define EX_NOUSER 67
+# define EX_NOHOST 68
+# define EX_UNAVAILABLE 69
+# define EX_SOFTWARE 70
+# define EX_OSERR 71
+# define EX_OSFILE 72
+# define EX_CANTCREAT 73
+# define EX_IOERR 74
+# define EX_TEMPFAIL 75
+# define EX_PROTOCOL 76
+# define EX_NOPERM 77
+# define EX_CONFIG 78
+
+#endif
+
+#endif /* _GL_SYSEXITS_H */
+#endif /* _GL_SYSEXITS_H */

diff --git a/lib/sysexits_.h b/lib/sysexits_.h
deleted file mode 100644 (file)
index b65e0cc..0000000
--- a/lib/sysexits_.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* exit() exit codes for some BSD system programs.
-   Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Written by Simon Josefsson based on sysexits(3) man page */
-
-#ifndef _GL_SYSEXITS_H
-
-#if @HAVE_SYSEXITS_H@
-
-/* IRIX 6.5 has an <unistd.h> that defines a macro EX_OK with a nonzero
-   value.  Override it.  See
-   <http://lists.gnu.org/archive/html/bug-gnulib/2007-03/msg00361.html>  */
-# ifdef __sgi
-#  include <unistd.h>
-#  undef EX_OK
-# endif
-
-/* The include_next requires a split double-inclusion guard.  */
-# @INCLUDE_NEXT@ @NEXT_SYSEXITS_H@
-
-/* HP-UX 11 <sysexits.h> ends at EX_NOPERM.  */
-# ifndef EX_CONFIG
-#  define EX_CONFIG 78
-# endif
-
-#endif
-
-#ifndef _GL_SYSEXITS_H
-#define _GL_SYSEXITS_H
-
-#if !@HAVE_SYSEXITS_H@
-
-# define EX_OK 0 /* same value as EXIT_SUCCESS */
-
-# define EX_USAGE 64
-# define EX_DATAERR 65
-# define EX_NOINPUT 66
-# define EX_NOUSER 67
-# define EX_NOHOST 68
-# define EX_UNAVAILABLE 69
-# define EX_SOFTWARE 70
-# define EX_OSERR 71
-# define EX_OSFILE 72
-# define EX_CANTCREAT 73
-# define EX_IOERR 74
-# define EX_TEMPFAIL 75
-# define EX_PROTOCOL 76
-# define EX_NOPERM 77
-# define EX_CONFIG 78
-
-#endif
-
-#endif /* _GL_SYSEXITS_H */
-#endif /* _GL_SYSEXITS_H */

diff --git a/modules/sysexits b/modules/sysexits
index 955f915043a4cc6c0eda9349c26f17ce729e9e33..bb1b7e3b1d40afe85db46059e91a096641b383dc 100644 (file)
--- a/modules/sysexits
+++ b/modules/sysexits
@@ -2,7 +2,7 @@ Description:
 Exit status codes for some BSD system programs.
 
 Files:
-lib/sysexits_.h
+lib/sysexits.in.h
 m4/sysexits.m4
 
 Depends-on:
@@ -16,12 +16,12 @@ BUILT_SOURCES += $(SYSEXITS_H)
 
 # We need the following in order to create <sysexits.h> when the system
 # doesn't have one that works with the given compiler.
-sysexits.h: sysexits_.h
+sysexits.h: sysexits.in.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \
              -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
              -e 's|@''NEXT_SYSEXITS_H''@|$(NEXT_SYSEXITS_H)|g' \
-             < $(srcdir)/sysexits_.h; \
+             < $(srcdir)/sysexits.in.h; \
        } > $@-t
        mv -f $@-t $@
 MOSTLYCLEANFILES += sysexits.h sysexits.h-t