fix paths

skvark · skvark · commit fed2178dfc28 · 2020-12-28T20:02:34.000+02:00
diff --git a/setup.py b/setup.py
@@ -93,7 +93,7 @@ def main():
     # Path regexes with forward slashes relative to CMake install dir.
     rearrange_cmake_output_data = {
         "cv2": (
-            [r"bin/opencv_ffmpeg\d{3,4}%s\.dll" % ("_64" if x64 else "")]
+            [r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll" % ("_64" if x64 else "")]
             if os.name == "nt"
             else []
         )
@@ -106,7 +106,7 @@ def main():
             % {"ext": re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
         ],
         "cv2.data": [  # OPENCV_OTHER_INSTALL_PATH
-            ("etc" if os.name == "nt" else "share/OpenCV") + r"/haarcascades/.*\.xml"
+            ("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
         ],
     }
 
