Merge pull request #581 from libexpat/fix-windows-installer
Fix windows installer (related to #555, follow-up to #570)
diff --git a/expat/Changes b/expat/Changes
index ff4ed87..95f697b 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -11,7 +11,7 @@
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 0c8f676..0c0c53b 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -77,7 +77,7 @@
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"