From ba22751658ee1e3c1141f448f3217927b306665b Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Thu, 23 Jan 2020 19:48:38 +0000
Subject: [PATCH] Squashed 'third_party/nlbuild-autotools/repo/' changes from
 b1b93c9d..4cbe14a4

4cbe14a4 Update version to 1.6.16.
7adbffbc Merge pull request #30 from bukepo/pretty/support-abs
2ac7f5da Add absolute path support for pretty

git-subtree-dir: third_party/nlbuild-autotools/repo
git-subtree-split: 4cbe14a4adb8702d81a63fd663bf046407908def
---
 .default-version              | 2 +-
 CHANGES                       | 4 ++++
 automake/post/rules/pretty.am | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.default-version b/.default-version
index 5577648bd..9494224a9 100644
--- a/.default-version
+++ b/.default-version
@@ -1 +1 @@
-1.6.14
+1.6.16
diff --git a/CHANGES b/CHANGES
index 3177bd392..c15255c5c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.6.16 (2020-01-23)
+
+        * Allow absolute paths in PRETTY_FILES.
+
 1.6.15 (2019-12-06)
 
         * Remove redundant libtool m4 libraries.
diff --git a/automake/post/rules/pretty.am b/automake/post/rules/pretty.am
index 91ee60303..5498a9720 100644
--- a/automake/post/rules/pretty.am
+++ b/automake/post/rules/pretty.am
@@ -47,8 +47,8 @@
 define nl-make-pretty
 $(AM_V_at)for file in $(4); do \
     $(1) \
-    if test -f $${file}; then d=.; else d=$(srcdir); fi; \
-    $(2) $(3) $${d}/$${file} \
+    if test -f $${file}; then d=; else d=$(srcdir)/; fi; \
+    $(2) $(3) $${d}$${file} \
     || exit 1; \
 done
 endef