Attachment #602642 for bug #704850

Lines 363-374 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zeek-config DESTINATION bin) Link Here

(-)a/CMakeLists.txt (-6 lines)
363	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/zeek	363	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/zeek
364	USE_SOURCE_PERMISSIONS)	364	USE_SOURCE_PERMISSIONS)
365	# Install wrapper script for Bro-to-Zeek renaming.
366	include(InstallShellScript)
367	include(InstallSymlink)
368	InstallShellScript("bin" "zeek-wrapper.in" "zeek-wrapper")
369	InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro-config")
370
371	########################################################################	365	########################################################################
372	## Recurse on sub-directories	366	## Recurse on sub-directories

Lines 5-11 set(zeekcut_SRCS Link Here

(-)a/aux/zeek-aux/zeek-cut/CMakeLists.txt (-4 lines)
5	add_executable(zeek-cut ${zeekcut_SRCS})	5	add_executable(zeek-cut ${zeekcut_SRCS})
6	install(FILES zeek-cut.1 DESTINATION ${ZEEK_MAN_INSTALL_PATH}/man1)	6	install(FILES zeek-cut.1 DESTINATION ${ZEEK_MAN_INSTALL_PATH}/man1)
7
8	# Install wrapper script for Bro-to-Zeek renaming.
9	include(InstallSymlink)
10	InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro-cut")

Lines 365-374 endif () Link Here

(-)a/src/CMakeLists.txt (-4 lines)
365	install(TARGETS zeek DESTINATION bin)	365	install(TARGETS zeek DESTINATION bin)
366	# Install wrapper script for Bro-to-Zeek renaming.
367	include(InstallSymlink)
368	InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro")
369
370	set(BRO_EXE zeek	366	set(BRO_EXE zeek
371	CACHE STRING "Zeek executable binary" FORCE)	367	CACHE STRING "Zeek executable binary" FORCE)

Return to bug 704850