From 259337dcd5683e22fb100acdf572f9df40ca26c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20B=C3=B6hn=20/=20FI?= <fish2000@gmail.com> Date: Thu, 11 Jun 2015 14:05:37 -0700 Subject: [PATCH] Keep Makefile.am from double-installing detail/Clock.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- folly/Makefile.am | 1 - 1 file changed, 1 deletion(-) 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 -- 2.34.1