Change CMAKE_INSTALL_DATADIC to CMAKE_INSTALL_DATADIR in an attempt to fix dictionary...

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 3de5f5deaa6ed026556e8651c70ac02f373f2bf5..8a4acbfeece01cd6cce9add0eaa51871b745ba8a 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -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_DATADIC} COMPONENT data)
++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIR} 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 ecefa16f1ba760fc8987a9e8233fb1fb112b41db..503938734a206689931d89cb63805512f100fda0 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_DATADIC:STRING=share/libdcmtk17 \
+ -DCMAKE_INSTALL_DATADIR:STRING=share/libdcmtk17 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
  -DDCMTK_ENABLE_STL:BOOL=ON \
  -DCMAKE_CXX_STANDARD:STRING=17