Skip to content

Commit a43dbc2

Browse files
committed
cmake: CMAKE_INSTALL_PREFIX should be evaluated at install stage
Actually CMAKE_INSTALL_PREFIX variable is not properly escape. This make cmake_install generated file with hardcoded path and modifying the $prefix at install stage is not usable. $> cmake --install . --prefix my_prefix Could not create symbolic link from /usr/local/share/man/man3/pcap_datalink_val_to_name.3pcap Fix this by properly escaping the CMAKE_INSTALL_PREFIX so the variable is evaluated at install stage. Signed-off-by: Clément Péron <peron.clem@gmail.com>
1 parent 47d2794 commit a43dbc2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3301,21 +3301,21 @@ function(install_manpage_symlink SOURCE TARGET MANDIR)
33013301

33023302
install(CODE "
33033303
if(NOT ${CMAKE_INSTALL_MESSAGE} STREQUAL \"NEVER\")
3304-
message(STATUS \"Symlinking: \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
3304+
message(STATUS \"Symlinking: \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
33053305
endif()
33063306
execute_process(
33073307
COMMAND \"${CMAKE_COMMAND}\" \"-E\" \"remove\" \"${TARGET}\"
3308-
WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MANDIR}
3308+
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDIR}
33093309
)
33103310
execute_process(
33113311
COMMAND ${LINK_COMMAND}
3312-
WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${MANDIR}
3312+
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${MANDIR}
33133313
RESULT_VARIABLE EXIT_STATUS
33143314
)
33153315
if(NOT EXIT_STATUS EQUAL 0)
3316-
message(FATAL_ERROR \"Could not create symbolic link from ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
3316+
message(FATAL_ERROR \"Could not create symbolic link from \${CMAKE_INSTALL_PREFIX}/${MANDIR}/${SOURCE} to ${TARGET}\")
33173317
endif()
3318-
set(CMAKE_INSTALL_MANIFEST_FILES \${CMAKE_INSTALL_MANIFEST_FILES} ${CMAKE_INSTALL_PREFIX}/${MANDIR}/${TARGET})")
3318+
set(CMAKE_INSTALL_MANIFEST_FILES \${CMAKE_INSTALL_MANIFEST_FILES} \${CMAKE_INSTALL_PREFIX}/${MANDIR}/${TARGET})")
33193319
endfunction(install_manpage_symlink)
33203320

33213321
set(MAN1_NOEXPAND pcap-config.1)

0 commit comments

Comments
 (0)