From: Alexander Böhn / FI <fish2000@gmail.com>
Date: Thu, 11 Jun 2015 21:05:37 +0000 (-0700)
Subject: Keep Makefile.am from double-installing detail/Clock.h
X-Git-Tag: v0.47.0~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=259337dcd5683e22fb100acdf572f9df40ca26c8;hp=36ca845043259977fac1e8cddec7427d711e1126;p=folly.git

Keep Makefile.am from double-installing detail/Clock.h

Summary: On non-Linux systems, the autotools-based build system conditionally appends `detail/Clock.h` to `libfollybase_la_SOURCES` – even though that file is in there statically no matter what (as per [line 46](https://github.com/facebook/folly/blob/master/folly/Makefile.am#L46)), which causes the `install` command to error out trying to install the file twice, during `make install`… this patch takes out the conditional append.
Closes #201

Reviewed By: @yfeldblum

Differential Revision: D2148004

Pulled By: @sgolemon
---

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 6ce7705b..b6f8310c 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -434,7 +434,6 @@ libfolly_la_SOURCES += \
 endif
 
 if !HAVE_LINUX
-nobase_follyinclude_HEADERS += detail/Clock.h
 libfollybase_la_SOURCES += detail/Clock.cpp
 endif