From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 21 Nov 2017 16:38:25 +0000 (+0100)
Subject: doc: rename OS X to macOS
X-Git-Tag: 1.0.0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac57139f73d5cc8314c5d671c29a1da9ebbd4740;p=thirdparty%2Flldpd.git

doc: rename OS X to macOS
---

diff --git a/README.md b/README.md
index 909f5659..a73ae5e9 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ The following OS are supported:
 
  * FreeBSD
  * GNU/Linux
- * OS X
+ * macOS
  * NetBSD
  * OpenBSD
  * Solaris
@@ -60,10 +60,10 @@ syslog, copy `/etc/locatime` into the chroot.
 line. If you don't want to run it as root, just install it setuid or
 setgid `_lldpd`.
 
-Installation (OS X)
+Installation (macOS)
 -----------------------
 
-The same procedure as above applies for OS X. However, there are
+The same procedure as above applies for macOS. However, there are
 simpler alternatives:
 
  1. Use [Homebrew](https://brew.sh):
@@ -72,15 +72,15 @@ simpler alternatives:
         # Or, for the latest version:
         brew install https://raw.github.com/vincentbernat/lldpd/master/osx/lldpd.rb
 
- 2. Build an OS X installer package which should work on the same
-    version of OS X:
+ 2. Build an macOS installer package which should work on the same
+    version of macOS:
  
         mkdir build && cd build
         ../configure --prefix=/usr/local --localstatedir=/var --sysconfdir=/private/etc --with-embedded-libevent \
             --without-snmp
         make -C osx pkg
 
-    If you want to compile for an older version of OS X, you need
+    If you want to compile for an older version of macOS, you need
     to find the right SDK and issues commands like those:
 
         SDK=/Developer/SDKs/MacOSX10.6.sdk
diff --git a/m4/os.m4 b/m4/os.m4
index a8dae03f..ccc669a7 100644
--- a/m4/os.m4
+++ b/m4/os.m4
@@ -22,7 +22,7 @@ AC_DEFUN([lldp_CHECK_OS], [
   lldp_DEFINE_OS(dragonfly*, [DragonFly BSD], DRAGONFLY)
   lldp_DEFINE_OS(openbsd*, OpenBSD, OPENBSD)
   lldp_DEFINE_OS(netbsd*, NetBSD, NETBSD)
-  lldp_DEFINE_OS(darwin*, [OS X], OSX)
+  lldp_DEFINE_OS(darwin*, macOS, OSX)
   lldp_DEFINE_OS(solaris*, Solaris, SOLARIS)
 
   if test x"$os" = x; then