From ff4352d575866070fd8e9db96390cdfd4b6176c7 Mon Sep 17 00:00:00 2001 From: dolphin6k Date: Fri, 10 Jun 2022 10:57:06 +0900 Subject: [PATCH] Corrected suffix of the system-wide config file --- Makefile | 2 ++ win32/tuxpaint.iss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1946d21ca..4b615105c 100644 --- a/Makefile +++ b/Makefile @@ -671,6 +671,8 @@ bdist-win32: INCLUDE_PREFIX:=./win32/bdist/plugins/include \ MAGIC_PREFIX:=./win32/bdist/plugins \ ARCH_INSTALL:=install-dlls install-tpconf-i18n + mv ./win32/bdist/tuxpaint.conf ./win32/bdist/tuxpaint.cfg + unix2dos ./win32/bdist/tuxpaint.cfg # "make bdist-clean" deletes the 'bdist' directory .PHONY: bdist-clean diff --git a/win32/tuxpaint.iss b/win32/tuxpaint.iss index 7b7b53322..280b1017d 100644 --- a/win32/tuxpaint.iss +++ b/win32/tuxpaint.iss @@ -140,7 +140,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ [Files] Source: "{#BdistDir}\*.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "{#BdistDir}\*.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "{#BdistDir}\tuxpaint.conf"; DestDir: "{app}"; Flags: ignoreversion +Source: "{#BdistDir}\tuxpaint.cfg"; DestDir: "{app}"; Flags: ignoreversion Source: "{#BdistDir}\data\*"; DestDir: "{app}\data"; Excludes: "CVS"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#BdistDir}\docs\*"; DestDir: "{app}\docs"; Excludes: "CVS,Makefile,*~"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "{#BdistDir}\etc\*"; DestDir: "{app}\etc"; Flags: skipifsourcedoesntexist ignoreversion recursesubdirs createallsubdirs