Keep Makefile.am from double-installing detail/Clock.h
authorAlexander Böhn / FI <fish2000@gmail.com>
Thu, 11 Jun 2015 21:05:37 +0000 (14:05 -0700)
committerSara Golemon <sgolemon@fb.com>
Thu, 11 Jun 2015 21:50:32 +0000 (14:50 -0700)
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

index 6ce7705b156ed36cbb68c604b875b22fde63d12a..b6f8310c8d76e911bdf3d4326017430d207fb40d 100644 (file)
@@ -434,7 +434,6 @@ libfolly_la_SOURCES += \
 endif
 
 if !HAVE_LINUX
-nobase_follyinclude_HEADERS += detail/Clock.h
 libfollybase_la_SOURCES += detail/Clock.cpp
 endif