diff --git a/CMakeLists.txt b/CMakeLists.txt index b5c35a38..a207e145 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -587,11 +587,7 @@ install( COMPONENT development ) -if(MSVC) - configure_file(include/win32config.h config.h COPYONLY) -else() - configure_file(config.h.cmake.in config.h) -endif() +configure_file(config.h.cmake.in config.h) configure_file(include/libxml/xmlversion.h.in libxml/xmlversion.h) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml/xmlversion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) diff --git a/include/Makefile.am b/include/Makefile.am index 328b9932..c2f978db 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in SUBDIRS=libxml private -EXTRA_DIST = win32config.h wsockcompat.h meson.build +EXTRA_DIST = wsockcompat.h meson.build diff --git a/win32/configure.js b/win32/configure.js index 92f3fc7d..f2d26f77 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -605,7 +605,7 @@ if (f) { fso.CopyFile(makefile, new_makefile, true); WScript.Echo("Created Makefile."); // Create the config.h. -var confighsrc = "..\\include\\win32config.h"; +var confighsrc = "win32config.h"; var configh = "..\\config.h"; var f = fso.FileExists(configh); if (f) { diff --git a/include/win32config.h b/win32/win32config.h similarity index 100% rename from include/win32config.h rename to win32/win32config.h