From 0d3697298d82ee2ccfd0d316e29342224298df39 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 12 Jun 2012 13:53:25 -0400
Subject: [PATCH] Remove a couple of src/s files

* configure.in (opsysfile): Set specially for gnu-kfreebsd, openbsd.

* src/s/gnu-kfreebsd.h, src/s/openbsd.h: Remove files.
---
 ChangeLog            | 2 ++
 configure.in         | 5 +++++
 src/ChangeLog        | 2 ++
 src/s/gnu-kfreebsd.h | 2 --
 src/s/openbsd.h      | 5 -----
 5 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 src/s/gnu-kfreebsd.h
 delete mode 100644 src/s/openbsd.h

diff --git a/ChangeLog b/ChangeLog
index da39ee2e48d..13512bc13ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 
 2012-06-12  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (opsysfile): Set specially for gnu-kfreebsd, openbsd.
+
 	* configure.in (NO_TERMIO, BROKEN_SIGIO): Move here from src/s.
 
 	* configure.in: Anticipate platforms with no src/s file.
diff --git a/configure.in b/configure.in
index 2750ccdcd54..19fa655bf22 100644
--- a/configure.in
+++ b/configure.in
@@ -3125,6 +3125,11 @@ case $opsys in
   ;;
 esac
 
+case $opsys in
+  gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
+  openbsd) opsysfile="s/netbsd.h" ;;
+esac
+
 # Set up the CFLAGS for real compilation, so we can substitute it.
 CFLAGS="$REAL_CFLAGS"
 CPPFLAGS="$REAL_CPPFLAGS"
diff --git a/src/ChangeLog b/src/ChangeLog
index 2c5bf632bdb..bc588517b29 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-06-12  Glenn Morris  <rgm@gnu.org>
 
+	* s/gnu-kfreebsd.h, s/openbsd.h: Remove files.
+
 	* s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h:
 	Move BROKEN_SIGIO to configure.
 
diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
deleted file mode 100644
index c1e5de5c7a7..00000000000
--- a/src/s/gnu-kfreebsd.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "gnu-linux.h"
-
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
deleted file mode 100644
index 8c44cf65cc6..00000000000
--- a/src/s/openbsd.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* System file for openbsd.  */
-
-/* Nearly the same as NetBSD.  Note there are differences in configure.  */
-#include "netbsd.h"
-
-- 
2.39.5