From 6f38514280d607ec1a8483c9db811d2e4e7855a5 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Fri, 19 Apr 2019 08:04:39 +0900 Subject: [PATCH] Makefile: use more standard output filenames for msm Signed-off-by: Jason A. Donenfeld --- Makefile | 4 ++-- Makefile.PlatCfg.mak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index adf907b..e0c8318 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ dvl :: "wintun.DVL.XML" msm :: \ "$(DIST_DIR)" \ - "$(DIST_DIR)\wintun_$(WINTUN_VERSION)_x86.msm" \ - "$(DIST_DIR)\wintun_$(WINTUN_VERSION)_amd64.msm" + "$(DIST_DIR)\wintun-x86-$(WINTUN_VERSION).msm" \ + "$(DIST_DIR)\wintun-amd64-$(WINTUN_VERSION).msm" "sdv\SDV.DVL.xml" "amd64\Release\vc.nativecodeanalysis.all.xml" : msbuild.exe "wintun.vcxproj" /t:sdv /p:Inputs="/check:*" /p:Configuration="Release" /p:Platform="x64" $(MSBUILD_FLAGS) diff --git a/Makefile.PlatCfg.mak b/Makefile.PlatCfg.mak index 1dfd925..60a472a 100644 --- a/Makefile.PlatCfg.mak +++ b/Makefile.PlatCfg.mak @@ -30,7 +30,7 @@ clean :: "$(OUTPUT_DIR)\wintun.wixobj" : "wintun.wxs" "$(WIX)bin\candle.exe" $(WIX_CANDLE_FLAGS) -arch "$(PLAT_WIX)" -out $@ $** -"$(DIST_DIR)\wintun_$(WINTUN_VERSION)_$(PLAT).msm" : \ +"$(DIST_DIR)\wintun-$(PLAT)-$(WINTUN_VERSION).msm" : \ "$(DIST_DIR)" \ "$(OUTPUT_DIR)\wintun.cer" \ "$(OUTPUT_DIR)\wintun\wintun.cat" \