From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 9 Aug 2017 18:38:07 +0000 (-0400)
Subject: Merge pull request #911 from opensourcerouting/non-recursive-2
X-Git-Tag: frr-4.0-dev~434
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fc73dd4bdf96cbab00e7d5de67ec56503c6d9783;p=matthieu%2Ffrr.git

Merge pull request #911 from opensourcerouting/non-recursive-2

more non-recursive build, fix cross-compile, & doc build mangling
---

fc73dd4bdf96cbab00e7d5de67ec56503c6d9783
diff --cc lib/subdir.am
index 15ce8ec199,682ae45cb4..6a62cbb678
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@@ -123,9 -123,7 +123,8 @@@ pkginclude_HEADERS += 
  	lib/prefix.h \
  	lib/privs.h \
  	lib/ptm_lib.h \
 +	lib/pw.h \
  	lib/qobj.h \
- 	lib/route_types.h \
  	lib/routemap.h \
  	lib/sbuf.h \
  	lib/sha256.h \