Skip to content

Commit 8d7916c

Browse files
authored
Merge pull request #2922 from WardF/gh2920.wif
Honor CMAKE_INSTALL_MANDIR
2 parents 58e37e0 + ebd3f36 commit 8d7916c

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1520,6 +1520,9 @@ configure_file(
15201520
###
15211521
# Create pkgconfig files.
15221522
###
1523+
if(NOT DEFINED CMAKE_INSTALL_MANDIR)
1524+
set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/share/man/")
1525+
endif()
15231526

15241527
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
15251528
set(CMAKE_INSTALL_LIBDIR lib)

libsrc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ if(HAVE_M4)
9696
COMMAND ${NC_M4} ${ARGS_MANPAGE} "${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4" > "${CMAKE_CURRENT_BINARY_DIR}/netcdf.3"
9797
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
9898
)
99-
100-
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/netcdf.3" DESTINATION "share/man/man3" COMPONENT documentation)
99+
100+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/netcdf.3" DESTINATION "${CMAKE_INSTALL_MANDIR}/man3" COMPONENT documentation)
101101
endif(NOT MSVC)
102102

103103
endif()

ncdump/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,5 +355,5 @@ add_subdirectory(expected)
355355
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CLEANFILES}")
356356

357357
if(NOT MSVC)
358-
install(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation)
358+
install(FILES ${MAN_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT documentation)
359359
endif()

ncgen/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ENDIF()
8686

8787
SET(MAN_FILES ncgen.1)
8888
IF(NOT MSVC)
89-
INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1"
89+
INSTALL(FILES ${MAN_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
9090
COMPONENT documentation)
9191
ENDIF()
9292
SET(CLEANFILES c0.nc c0_64.nc c0_4.nc c0_4c.nc ref_camrun.c)

ncgen3/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ INSTALL(TARGETS ncgen3 DESTINATION bin COMPONENT utilities)
7575

7676
SET(MAN_FILES ncgen3.1)
7777
IF(NOT MSVC)
78-
INSTALL(FILES ${MAN_FILES} DESTINATION "share/man/man1" COMPONENT documentation)
78+
INSTALL(FILES ${MAN_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT documentation)
7979
ENDIF()
8080

8181
## Specify files to be distributed by 'make dist'

0 commit comments

Comments
 (0)