More install fixes

Author: augustss

Makefile

@@ -81,7 +81,7 @@ bin/mcabal:	$(RTS)/*.c $(RTS)/*.h $(RTS)/*/*.h #generated/mcabal.c
 	$(CCEVAL) generated/mcabal.c $(CCLIBS) -o bin/mcabal
 
 # Compile cpphs from distribution, with C compiler
-bin/install:	$(RTS)/*.c $(RTS)/*.h $(RTS)/*/*.h #generated/install.c
+bin/install:	$(RTS)/*.c $(RTS)/*.h $(RTS)/*/*.h generated/install.c
 	@mkdir -p bin
 	$(CCEVAL) generated/install.c $(CCLIBS) -o bin/install
 
@@ -381,6 +381,9 @@ slowinstall:	bin/cpphs bin/mcabal bin/mhs machdep
 	cd lib; PATH=$(MCABALBIN):"$$PATH" mcabal $(MCABALGMP) install
 	@echo $$PATH | tr ':' '\012' | grep -q $(MCABALBIN) || echo '***' Add $(MCABALBIN) to the PATH
 
+newinstall: bin/install
+	bin/install -i$(MCABAL) GMPFLAGS=$(MHSGMPCCFLAGS) GMPLIBS=$(MHSGMPCCLIBS)
+
 #####
 # Hugs
 HUGS= runhugs

Makefile.windows

@@ -4,6 +4,7 @@
 HOME=$(USERPROFILE)
 RTS=src/runtime
 CCEVAL=cl -nologo -F"obuild\\" -O2 -I$(RTS) -I$(RTS)/windows $(RTS)/main.c $(RTS)/eval.c
+MKDIR=md
 
 VERSION=0.15.7.0
 HVERSION=0,15,7,0
@@ -18,25 +19,30 @@ all:    bin/mhs.exe bin/mhseval.exe
 
 # Compile mhs from distribution, with C compiler
 bin/mhs.exe:	$(RTS)/*.c  $(RTS)/windows/* #generated/mhs.c
-	@-mkdir bin
-	@-mkdir build
+	@-$(MKDIR) bin
+	@-$(MKDIR) build
         $(CCEVAL) generated/mhs.c -Fe"bin\\mhs.exe"
 
 bin/cpphs.exe:	$(RTS)/*.c $(RTS)/*.h $(RTS)/*/*.h generated/cpphs.c
-	@-mkdir bin
-	@-mkdir build
+	@-$(MKDIR) bin
+	@-$(MKDIR) build
 	$(CCEVAL) generated/cpphs.c $(CCLIBS) -Fe"bin\\cpphs.exe"
 
+bin/install.exe:	$(RTS)/*.c $(RTS)/*.h $(RTS)/*/*.h generated/install.c
+	@-$(MKDIR) bin
+	@-$(MKDIR) build
+	$(CCEVAL) generated/install.c $(CCLIBS) -Fe"bin\\install.exe"
+
 # Compile mcabal from distribution, with C compiler
 bin/mcabal.exe:	$(RTS)/*.c $(RTS)/*.h $(RTS)/*/*.h generated/mcabal.c
-	@-mkdir bin
-	@-mkdir build
+	@-$(MKDIR) bin
+	@-$(MKDIR) build
 	$(CCEVAL) generated/mcabal.c $(CCLIBS) -Fe"bin\\mcabal.exe"
 
 # Compile combinator evaluator
 bin/mhseval.exe:	$(RTS)/*.c $(RTS)/windows/* $(RTS)/comb.c
-	@-mkdir bin
-	@-mkdir build
+	@-$(MKDIR) bin
+	@-$(MKDIR) build
 	cl -nologo -F"obuild\\" -O2 -I$(RTS) -I$(RTS)/windows $(RTS)/main.c $(RTS)/eval.c $(RTS)/comb.c -Fe"bin\\mhseval.exe"
 
 mhs.conf: mhs.conf.in
@@ -53,9 +59,12 @@ machdep:
 	cl -nologo Tools/machdep.c -Femachdep.exe && ./machdep.exe > $(RTS)/MachDeps.h && rm machdep.exe
 
 install:	bin/mhs.exe bin/cpphs.exe bin/mcabal.exe machdep
-	@mkdir $(MCABALBIN)
-        @mkdir $(MRUNTIME)
+	@$(MKDIR) $(MCABALBIN)
+        @$(MKDIR) $(MRUNTIME)
 	copy bin/mhs.exe bin/cpphs.exe bin/mcabal.exe $(MCABALBIN)
 	copy mhs.conf $(MDATA)
 	robocopy /e $(RTS)/* $(MRUNTIME)
 	bin/mhs -Q generated/base.pkg $(MCABALMHS)
+
+newinstall: bin/install.exe
+	bin\install