Update .appveyor.yml and setup.py

Author: RedFantom

.appveyor.yml

@@ -19,14 +19,14 @@ install:
 - zstd\zstd.exe -d mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.zst
 - dir
 - 7z a -tgzip mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.gz mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar
-- bash -lc "cd /c/projects/python-tksvg; ls -l; pacman --noconfirm -U mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.gz"
+- bash -lc "cd /c/projects/extrafont; ls -l; pacman --noconfirm -U mingw-w64-x86_64-zstd-1.4.8-2-any.pkg.tar.gz"
 # Download and install pacman for MSYS due to bug in MSYS
 - appveyor DownloadFile http://repo.msys2.org/msys/x86_64/pacman-5.2.2-9-x86_64.pkg.tar.zst
 - 7z e zstd-v1.4.8-win64.zip -ozstd -y
 - zstd\zstd.exe -d pacman-5.2.2-9-x86_64.pkg.tar.zst
 - dir
 - 7z a -tgzip pacman-5.2.2-9-x86_64.pkg.tar.gz pacman-5.2.2-9-x86_64.pkg.tar
-- bash -lc "cd /c/projects/python-tksvg; ls -l; pacman --noconfirm --nodeps --nodeps -U pacman-5.2.2-9-x86_64.pkg.tar.gz"
+- bash -lc "cd /c/projects/extrafont; ls -l; pacman --noconfirm --nodeps --nodeps -U pacman-5.2.2-9-x86_64.pkg.tar.gz"
 # Cleanup after bug workarounds
 - bash -lc "rm -rf zstd"
 - bash -lc "rm -rf *.tar *.zst"

setup.py

@@ -154,10 +154,14 @@ def copy_to_target(self, target: str):
                     shutil.copyfile(p, t)
                 else:
                     printf("Copying {}".format(p))
-                    shutil.copyfile(p, os.path.join(target, os.path.basename(p)))
+                    target_file = os.path.join(target, os.path.basename(p))
+                    try:
+                        shutil.copyfile(p, target_file)
+                    except shutil.SameFileError:
+                        continue
 
     specials = {}
-    DependencyWalker("libextrafont.dll", specials=specials).copy_to_target("extrafont")
+    DependencyWalker("tkextrafont/libextrafont.dll", specials=specials).copy_to_target("extrafont")
     kwargs = {"package_data": {"extrafont": ["*.dll", "pkgIndex.tcl", "extrafont.tcl"] + ["{}/{}".format(dir.strip("/"), base) for base, dir in specials.items()]}}
 
 else: