From ac772671ccbf486067aa3eb68dfc29c6809bd137 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 8 Apr 2016 09:21:53 +0200 Subject: [PATCH] Publish target split into PublishPre and Publish --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a7947dc..4f11ec9 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ Setup \ SetupDebug \ Register \ Unregister \ +PublishPre \ Publish :: "MSI\MSIBuild\Version\Version.mak" $(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@ @@ -183,12 +184,15 @@ RegisterShortcuts :: \ UnregisterShortcuts :: -if exist "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" rd /s /q "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" -Publish :: \ +PublishPre :: \ "$(PUBLISH_PACKAGE_DIR)" \ $(REDIST_EN_WIN32) \ $(REDIST_EN_X64) \ $(REDIST_SL_WIN32) \ - $(REDIST_SL_X64) \ + $(REDIST_SL_X64) + +Publish :: \ + PublishPre \ "$(PUBLISH_DIR)\catalog-0000.xml"