From 5ad4130088f183e61ba90ff38af1eca614d89eb2 Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Tue, 30 Jan 2018 19:02:46 -0800
Subject: [PATCH 1/3] Makefile: set argp flags on non-Linux OSs

---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 6444ed2..a212e69 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,14 @@ PREFIX = /usr/local
 INSTALL = install
 LN = ln
 
-# ATTENTION: You may need to enable the following lines to compile F3
-#            on your platform.
-#ARGP = /usr/local
-#CFLAGS += -I$(ARGP)/include
-#LDFLAGS += -L$(ARGP)/lib -largp
+ifndef OS
+	OS = $(shell uname -s)
+endif
+ifneq ($(OS), Linux)
+	ARGP = /usr/local
+	CFLAGS += -I$(ARGP)/include
+	LDFLAGS += -L$(ARGP)/lib -largp
+endif
 
 all: $(TARGETS)
 extra: $(EXTRA_TARGETS)

From 8dd6f0f4ecbdd2dd358fd7310d100393059def8d Mon Sep 17 00:00:00 2001
From: Misty De Meo <mistydemeo@gmail.com>
Date: Tue, 30 Jan 2018 19:02:53 -0800
Subject: [PATCH 2/3] README: update building instructions for argp

---
 README.rst | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index 507a42a..c41131c 100644
--- a/README.rst
+++ b/README.rst
@@ -154,23 +154,17 @@ for details.
    See https://trac.macports.org/browser/trunk/dports/sysutils/f3/Portfile
    for more information.
 
-4) Set compilation flags. These following environment variables are used
-   in the Makefile to locate the argp library:
-
-   HomeBrew::
-
-     export CFLAGS="$CFLAGS -I/usr/local/include/"
-     export LDFLAGS="$LDFLAGS -L/usr/local/lib/ -largp"
-
-   MacPorts::
-
-     export CFLAGS="$CFLAGS -I/opt/local/include/"
-     export LDFLAGS="$LDFLAGS -L/opt/local/lib/ -largp"
-
 5) Build F3::
 
+   When using Homebrew, you can just run::
+
        make
 
+   When using MacPorts, you will need to pass the location where MacPorts
+   installed argp-standalone::
+
+       make ARGP=/opt/local
+
 The extra applications for Linux
 --------------------------------
 

From 572af383ca324e3957fe386e7ab58ad75493702a Mon Sep 17 00:00:00 2001
From: Michel Machado <michel@digirati.com.br>
Date: Wed, 31 Jan 2018 10:25:02 -0500
Subject: [PATCH 3/3] Update README.rst

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index c41131c..a07a2ed 100644
--- a/README.rst
+++ b/README.rst
@@ -154,7 +154,7 @@ for details.
    See https://trac.macports.org/browser/trunk/dports/sysutils/f3/Portfile
    for more information.
 
-5) Build F3::
+4) Build F3::
 
    When using Homebrew, you can just run::