summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2022-03-04 22:23:07 +0100
committerGitHub <noreply@github.com>2022-03-04 22:23:07 +0100
commit27d5b8ba1771f916d9cfea2aac6bdac72071dc66 (patch)
treea2f5888f7809f16b76fc5c3e9fd6ea49497bcd8f
parent17b258471d1a126b56cb2242b4f7b0bc98a170fd (diff)
parentc3e9dcfc6645d714f2366fb1c7f990f5ff96fe1a (diff)
downloadlibexpat-git-R_2_4_7.tar.gz
Merge pull request #581 from libexpat/fix-windows-installerR_2_4_7
Fix windows installer (related to #555, follow-up to #570)
-rw-r--r--expat/Changes2
-rw-r--r--expat/win32/expat.iss2
2 files changed, 2 insertions, 2 deletions
diff --git a/expat/Changes b/expat/Changes
index ff4ed87c..95f697b3 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -11,7 +11,7 @@ Release 2.4.7 Fri March 4 2022
0123456789 % -._~ :/?#[]@ !$&'()*+,;=
Other changes:
- #555 #570 CMake|Windows: Store Expat version in the DLL
+ #555 #570 #581 CMake|Windows: Store Expat version in the DLL
#577 Document consequences of namespace separator choices not just
in doc/reference.html but also in header <expat.h>
#577 Document Expat's lack of validation of namespace URIs against
diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index 0c8f676b..0c0c53b4 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -77,7 +77,7 @@ Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc"
Flags: ignoreversion; Source: doc\*.xml; DestDir: "{app}\Doc"
Flags: ignoreversion; Source: win32\bin\Release\*.dll; DestDir: "{app}\Bin"
Flags: ignoreversion; Source: win32\bin\Release\*.lib; DestDir: "{app}\Bin"
-Flags: ignoreversion; Source: win32\version.rc; DestDir: "{app}\Bin"
+Flags: ignoreversion; Source: win32\version.rc; DestDir: "{app}\Source\win32"
Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source"
Flags: ignoreversion; Source: AUTHORS; DestDir: "{app}\Source"
Flags: ignoreversion; Source: Changes; DestDir: "{app}\Source"