From 436d0119ce6c9f2ec4b1c7a9aafaee352f8a4411 Mon Sep 17 00:00:00 2001
From: Bryce Denney <bryce@tlw.com>
Date: Fri, 13 Dec 2002 22:50:39 +0000
Subject: [PATCH] - make install should no longer copy docs-html.  It needs to
 copy the   docbook files instead.

---
 bochs/Makefile.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bochs/Makefile.in b/bochs/Makefile.in
index 80a623cd8..b144cf141 100644
--- a/bochs/Makefile.in
+++ b/bochs/Makefile.in
@@ -238,7 +238,7 @@ $(BX_OBJS): $(BX_INCLUDES)
 bxversion.h:
 	$(RM) -f bxversion.h
 	echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
-	echo '// $$Id: Makefile.in,v 1.131 2002-12-13 20:37:37 bdenney Exp $$' >> bxversion.h
+	echo '// $$Id: Makefile.in,v 1.132 2002-12-13 22:50:39 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
@@ -311,7 +311,7 @@ install: all @INSTALL_TARGET@
 # tools.
 #####################################################################
 
-install_win32: download_dlx
+install_win32: download_dlx @INSTALL_DOCBOOK_VAR@
 	-mkdir -p $(prefix)
 	cp obj-release/*.exe .
 	for i in $(INSTALL_LIST_WIN32) niclist; do if test -f $$i; then cp $$i $(prefix); else cp $(srcdir)/$$i $(prefix); fi; done
@@ -319,7 +319,6 @@ install_win32: download_dlx
 	cp $(srcdir)/misc/sb16/sb16ctrl.exe $(prefix)
 	cat $(srcdir)/build/win32/DOC-win32.htm | $(SED) -e 's/@VERSION@/$(VERSION)/g' > $(prefix)/DOC-win32.htm
 	cp $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt
-	cp -r $(srcdir)/docs-html $(prefix)
 	-mkdir $(prefix)/keymaps
 	cp $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps
 	cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -)
@@ -629,7 +628,6 @@ install_macosx: all download_dlx @INSTALL_DOCBOOK_VAR@
 	-mkdir -p $(prefix)
 	for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r $$i $(prefix); else $(CPMAC) -r $(srcdir)/$$i $(prefix); fi; done
 	$(CPMAC) $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt
-	$(CPMAC) -r $(srcdir)/docs-html $(prefix)
 	-mkdir $(prefix)/keymaps
 	$(CPMAC) $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps
 	cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -)