Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

"make package" with PREFIX!=/usr is broken for rpm platforms

  commit 853a0ce broke it: spec template uses default platform path instead of our cmake/cpack PREFIX set by user
  • Loading branch information...
commit 32d301283d8dca2c4b18014ce6fc7f6f90f54377 1 parent ddea64a
@SethDart SethDart authored
Showing with 7 additions and 0 deletions.
  1. +3 −0  CMakeLists.txt
  2. +4 −0 opencpn.spec.in
View
3  CMakeLists.txt
@@ -1094,6 +1094,9 @@ IF(UNIX AND NOT APPLE)
SET(CPACK_RPM_PACKAGE_ARCHITECTURE ${ARCH})
SET(CPACK_RPM_PACKAGE_REQUIRES ${PACKAGE_DEPS})
SET(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_SOURCE_DIR}/opencpn.spec.in")
+ SET(CPACK_OPENCPN_RPM_BINDIR "${CMAKE_INSTALL_PREFIX}/${PREFIX_BIN}")
+ SET(CPACK_OPENCPN_RPM_LIBDIR "${PREFIX_LIB}")
+ SET(CPACK_OPENCPN_RPM_DATADIR "${CMAKE_INSTALL_PREFIX}/${PREFIX_DATA}")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenSource Chart Plotter/Navigator")
SET(CPACK_PACKAGE_DESCRIPTION "OpenCPN is a concise ChartPlotter/Navigator. The application supports: GPS/GPDS Position Input, BSB Raster Chart Display, S57 Vector ENChart Display, AIS Input Decoding, Waypoint Autopilot Navigation .")
SET(CPACK_SET_DESTDIR ON)
View
4 opencpn.spec.in
@@ -22,6 +22,10 @@ Vendor: @CPACK_RPM_PACKAGE_VENDOR@
%define _rpmfilename @CPACK_RPM_FILE_NAME@
%define _unpackaged_files_terminate_build 0
%define _topdir @CPACK_RPM_DIRECTORY@
+# This is a hack to change platform default path with our cmake/cpack ones
+%define _bindir @CPACK_OPENCPN_RPM_BINDIR@
+%define _libdir @CPACK_OPENCPN_RPM_LIBDIR@
+%define _datadir @CPACK_OPENCPN_RPM_DATADIR@
@TMP_RPM_SPEC_INSTALL_POST@
@CPACK_RPM_SPEC_MORE_DEFINE@
@CPACK_RPM_COMPRESSION_TYPE_TMP@
Please sign in to comment.
Something went wrong with that request. Please try again.