Second try at fixing dictionary path

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 8a4acbfeece01cd6cce9add0eaa51871b745ba8a..4ff89856cfa25cd0f50f4c2078dfa5873b3db243 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -47,11 +47,11 @@ Author: Mathieu Malaterre <malat@debian.org>
    # Set dictionary path to the data dir inside install main dir (prefix).
    if(DCMTK_DEFAULT_DICT STREQUAL "external")
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/private.dic")
      endif()
    else()
      set(DCM_DICT_DEFAULT_PATH "")
@@ -63,7 +63,7 @@ Author: Mathieu Malaterre <malat@debian.org>
 +set(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}")
 +
 +install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data)
-+install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIR} COMPONENT data)
++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIC} COMPONENT data)
  
  # add paths to the dictionaries to a CMake variable for being used by the unit tests
  set(DCMTK_DICOM_DICTIONARIES

diff --git a/debian/rules b/debian/rules
index 503938734a206689931d89cb63805512f100fda0..ecefa16f1ba760fc8987a9e8233fb1fb112b41db 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_ICU:BOOL=OFF \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_INSTALL_DATADIR:STRING=share/libdcmtk17 \
+ -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk17 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
  -DDCMTK_ENABLE_STL:BOOL=ON \
  -DCMAKE_CXX_STANDARD:STRING=17