From dd1b64b5cbec6f49a9697a6d2219e9c28ddbead2 Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Sun, 18 Nov 2001 02:32:59 +0000 Subject: [PATCH] - don't make all on install_win32 target, since the makefile is built for nmake and the install_win32 target is intended for cygwin. - work around some bug with unix2dos that doesn't let it read from absolute path (?) --- bochs/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bochs/Makefile.in b/bochs/Makefile.in index 6e07f8941..983d4708c 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -190,7 +190,7 @@ $(BX_OBJS): $(BX_INCLUDES) bxversion.h: $(RM) -f bxversion.h echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h - echo '// $$Id: Makefile.in,v 1.57 2001-11-10 04:00:52 bdenney Exp $$' >> bxversion.h + echo '// $$Id: Makefile.in,v 1.58 2001-11-18 02:32:59 bdenney Exp $$' >> bxversion.h echo '/////////////////////////////////////////////////////////////////////////' >> bxversion.h echo '// This file is generated by "make bxversion.h"' >> bxversion.h echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h @@ -264,7 +264,7 @@ install: all @INSTALL_TARGET@ # tools. ##################################################################### -install_win32: all download_dlx +install_win32: download_dlx -mkdir -p $(prefix) for i in $(INSTALL_LIST); do if test -f $$i; then cp $$i $(prefix); else cp $(srcdir)/$$i $(prefix); fi; done cp $(srcdir)/misc/sb16/sb16ctrl.example $(prefix)/sb16ctrl.txt @@ -279,7 +279,7 @@ install_win32: all download_dlx cat $(srcdir)/build/win32/README.win32-binary $(prefix)/README.orig > $(prefix)/README rm -f $(prefix)/README.orig for i in README CHANGES COPYING VGABIOS-elpin-LICENSE dlxlinux/README; do mv $(prefix)/$$i $(prefix)/$$i.txt; done - $(UNIX2DOS) $(prefix)/*.txt $(prefix)/*/*.txt + cd $(prefix); $(UNIX2DOS) *.txt */*.txt cd $(prefix); NAME=`pwd|$(SED) 's/.*\///'`; (cd ..; $(ZIP) $$NAME.zip -r $$NAME); ls -l ../$$NAME.zip #####################################################################