diff --git a/Makefile b/Makefile index 136149ba3abc38419739bd130a0d1f94a599e49e..d5c62200fb62f6d4eaf838e1505f135b6702884e 100644 --- a/Makefile +++ b/Makefile @@ -110,9 +110,11 @@ ifneq (${UNAME},WIN32MSVC) mkdir -p ${libdir} cp -f lib/libGmsh${LIBEXT} ${libdir}/libGmsh${LIBSUFFIX}${LIBEXT} else - erase ${includedir}\gmsh\* - copy ${subst /,\\,${GMSH_API}} ${includedir}\gmsh - copy lib\libGmsh${LIBEXT} ${libdir}\libGmsh${LIBSUFFIX}${LIBEXT} + if not exist ${includedir}\gmsh mkdir ${includedir}\gmsh + if not exist ${libdir} mkdir ${libdir} + erase /q ${includedir}\gmsh\*.h + for %%i in (${subst /,\,${GMSH_API}}) do copy %%i ${includedir}\gmsh + copy /y lib\libGmsh${LIBEXT} ${libdir}\libGmsh${LIBSUFFIX}${LIBEXT} endif uninstall-lib: diff --git a/utils/misc/variables.msvc b/utils/misc/variables.msvc index b3fc4e3a7e209774d2d0a5b9e3e5de74d7cd9549..9b184111abdfcf86affa53cdf0c57cffbf3a6ed7 100644 --- a/utils/misc/variables.msvc +++ b/utils/misc/variables.msvc @@ -161,12 +161,12 @@ LIBEXT=.lib EXEEXT=.exe # Installation directories -prefix="S:/Lib/gmsh" +prefix="S:\Lib\gmsh" exec_prefix=${prefix} -bindir=${exec_prefix}/bin +bindir=${exec_prefix}\bin datadir=${datarootdir} -datarootdir=${prefix}/share -includedir=${prefix}/include -libdir=${exec_prefix}/lib -mandir=${datarootdir}/man -infodir=${datarootdir}/info +datarootdir=${prefix}\share +includedir=${prefix}\include +libdir=${exec_prefix}\lib +mandir=${datarootdir}\man +infodir=${datarootdir}\info