- make install should no longer copy docs-html. It needs to copy the

docbook files instead.
This commit is contained in:
Bryce Denney 2002-12-13 22:50:39 +00:00
parent 9821369a9f
commit 436d0119ce

View File

@ -238,7 +238,7 @@ $(BX_OBJS): $(BX_INCLUDES)
bxversion.h: bxversion.h:
$(RM) -f bxversion.h $(RM) -f bxversion.h
echo '/////////////////////////////////////////////////////////////////////////' > 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 '/////////////////////////////////////////////////////////////////////////' >> bxversion.h
echo '// This file is generated by "make bxversion.h"' >> bxversion.h echo '// This file is generated by "make bxversion.h"' >> bxversion.h
echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h echo "#define VER_STRING \"$(VER_STRING)\"" >> bxversion.h
@ -311,7 +311,7 @@ install: all @INSTALL_TARGET@
# tools. # tools.
##################################################################### #####################################################################
install_win32: download_dlx install_win32: download_dlx @INSTALL_DOCBOOK_VAR@
-mkdir -p $(prefix) -mkdir -p $(prefix)
cp obj-release/*.exe . 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 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) cp $(srcdir)/misc/sb16/sb16ctrl.exe $(prefix)
cat $(srcdir)/build/win32/DOC-win32.htm | $(SED) -e 's/@VERSION@/$(VERSION)/g' > $(prefix)/DOC-win32.htm 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 $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt
cp -r $(srcdir)/docs-html $(prefix)
-mkdir $(prefix)/keymaps -mkdir $(prefix)/keymaps
cp $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps cp $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps
cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -) cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -)
@ -629,7 +628,6 @@ install_macosx: all download_dlx @INSTALL_DOCBOOK_VAR@
-mkdir -p $(prefix) -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 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) $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt
$(CPMAC) -r $(srcdir)/docs-html $(prefix)
-mkdir $(prefix)/keymaps -mkdir $(prefix)/keymaps
$(CPMAC) $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps $(CPMAC) $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps
cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -) cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -)