1 files changed, 5 insertions, 6 deletions
diff --git a/makefile.after b/makefile.after
index d024b3456..18b1d6f25 100644
--- a/makefile.after
+++ b/makefile.after
@@ -3,12 +3,6 @@ OBJS:=$(OBJS:%.cc=$(OBJDIR)$/%$(OBJEXT))
 
 RESOBJS:=$(RESOURCES:%.rc=$(OBJDIR)$/%.res)
 
-ifeq ($(DEBUG),1)
-MANIFESTFILE:=$(MHMAKECONF)\runtime.debug.manifest
-else
-MANIFESTFILE:=$(MHMAKECONF)\runtime.manifest
-endif
-
 ifdef SUBDIRS
 load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
 all: $(SUBDIRS:%=%\all)
@@ -34,8 +28,13 @@ PDB := $(EXE:%.exe=%.pdb)
 
 #LINKFLAGS += /SUBSYSTEM:WINDOWS
 
+MANIFESTFILE:=$(OBJDIR)\runtime.manifest
+
 all: $(EXE)
 
+$(MANIFESTFILE):
+	$(MHMAKECONF)/tools/genruntimemanifest $@ $(DEBUG)
+
 $(EXE) :  $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE)
 	$(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(OBJS) $(RESOBJS)
 	mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1