From: Gregory C. Sharp <gregsharp.geo@yahoo.com>
Date: Thu, 16 Jun 2022 15:54:09 +0000 (-0400)
Subject: Second try at fixing dictionary path
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~76
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70a251327841cd6dbab807d9ce6cb2b31a5bbf5b;p=dcmtk.git

Second try at fixing dictionary path
---

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 8a4acbfe..4ff89856 100644
--- 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 50393873..ecefa16f 100755
--- 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