From cfc77ed4dabed6aa5f5c16c5b1643b96ff3ce080 Mon Sep 17 00:00:00 2001
From: szapp <dev.szapp@gmail.com>
Date: Tue, 22 Oct 2019 17:58:00 +0200
Subject: [PATCH] Fix makefile concerning the setup

---
 Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 28e9a9b..78a534d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ else ifeq ($(shell uname), Linux)
 	SCRIPTEXT	:=	.sh
 endif
 
+# Meta data
+META			:=	metadata
+
 # Include meta data
 include $(META)
 export VERSION=$(VBASE).$(VMAJOR).$(VMINOR)
@@ -50,9 +53,6 @@ FLAGS_A			:=	-f win32 $(FLAGS_C)
 FLAGS_L			:=	/dll /entry DllMain /largeaddressaware /nxcompat /dynamicbase /ni
 FLAGS_RC		:=	/ni
 
-# Meta data
-META			:=	metadata
-
 # TARGET
 TARGET			:=	$(BUILDDIR)Ninja$(DLLEXT)
 OBJ				:=	$(BINDIR)Ninja$(OBJEXT)
@@ -67,7 +67,7 @@ WRAPPER_OBJ		:=	$(BINDIR)BugslayerUtil$(OBJEXT)
 WRAPPER_SRC		:=	$(DLLDIR)BugslayerUtil$(ASMEXT)
 
 # SETUP
-SETUP			:=	$(BUILDDIR)Ninja-$(VERSION)$(EXE)
+SETUP			:=	$(BUILDDIR)Ninja-$(VERSION)$(EXEEXT)
 SETUPSCR		:=	$(SETUPDIR)Ninja$(NSIEXT)
 
 # System dependencies
@@ -175,10 +175,6 @@ EXEC			:=	$(EXEC_BASE:%=$(EXECDIR)%$(ASMEXT))
 DATA			:=	$(DATA_BASE:%=$(DATADIR)%$(ASMEXT))
 
 
-# Include meta data (re-include for environment variables)
-include $(META)
-export VERSION=$(VBASE).$(VMAJOR).$(VMINOR)
-
 # Phony rules
 all : $(SETUP)