From e2dd61698ebfb0ec15adb9d40f05d06f17d0273b Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Sat, 6 Jul 2019 01:37:23 +0200 Subject: [PATCH] makefile: install heretic2 stuff like cmake does --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cdfbff0f..295397aa 100644 --- a/Makefile +++ b/Makefile @@ -434,8 +434,8 @@ binaries-qdata3: \ .PHONY: binaries-h2data binaries-h2data: \ - $(INSTALLDIR)/heretic2/h2data.$(EXE) \ - $(INSTALLDIR)/heretic2/h2data \ + $(INSTALLDIR)/h2data.$(EXE) \ + $(INSTALLDIR)/h2data \ .PHONY: binaries-tools-quake3 binaries-tools-quake3: \ @@ -1018,9 +1018,9 @@ $(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \ contrib/bkgrnd2d/dialog.o \ contrib/bkgrnd2d/plugin.o \ -$(INSTALLDIR)/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML) -$(INSTALLDIR)/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/heretic2/common -Itools/heretic2/qcommon -Itools/heretic2/h2data -Itools/quake2/common -Ilibs -Iinclude -$(INSTALLDIR)/heretic2/h2data.$(EXE): \ +$(INSTALLDIR)/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML) +$(INSTALLDIR)/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/heretic2/common -Itools/heretic2/qcommon -Itools/heretic2/h2data -Itools/quake2/common -Ilibs -Iinclude +$(INSTALLDIR)/h2data.$(EXE): \ tools/heretic2/common/bspfile.o \ tools/heretic2/common/cmdlib.o \ tools/heretic2/common/inout.o \ -- 2.39.2