diff --git a/bochs/Makefile.in b/bochs/Makefile.in index e3e26e685..8a2c7ef96 100644 --- a/bochs/Makefile.in +++ b/bochs/Makefile.in @@ -52,7 +52,7 @@ INSTALL_LIST_DOC=CHANGES COPYING README TODO INSTALL_LIST_BIN=bochs@EXE@ bximage@EXE@ bxcommit@EXE@ INSTALL_LIST_BIN_OPTIONAL=bochsdbg@EXE@ INSTALL_LIST_WIN32=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) $(INSTALL_LIST_BIN) $(INSTALL_LIST_BIN_OPTIONAL) niclist@EXE@ -INSTALL_LIST_MACOSX=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) bochs.app bochs.scpt bximage bxcommit +INSTALL_LIST_MACOSX=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) bochs.scpt # for win32 and macosx, these files get renamed to *.txt in install process TEXT_FILE_LIST=README CHANGES COPYING TODO VGABIOS-elpin-LICENSE VGABIOS-lgpl-README CP=cp @@ -249,7 +249,7 @@ $(BX_OBJS): $(BX_INCLUDES) bxversion.h: $(RM) -f bxversion.h echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h - echo '// $$Id: Makefile.in,v 1.179 2006-04-09 13:55:53 vruppert Exp $$' >> bxversion.h + echo '// $$Id: Makefile.in,v 1.180 2006-11-05 10:41:56 vruppert 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 @@ -652,19 +652,19 @@ $(APP)/.build_plugins: $(APP)/.build bochs_plugins $(LIBTOOL) --finish $(STANDALONE_LIBDIR); touch $(APP)/.build_plugins -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 - -mkdir $(prefix)/keymaps - $(CPMAC) $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps - cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -) - dlxrc=$(prefix)/dlxlinux/bochsrc.txt; mv "$$dlxrc" "$$dlxrc.orig" && sed < "$$dlxrc.orig" 's/\/usr\/local\/bochs\/latest/../' > "$$dlxrc" && rm -f "$$dlxrc.orig" - mv $(prefix)/README $(prefix)/README.orig - cat $(srcdir)/build/macosx/README.macosx-binary $(prefix)/README.orig > $(prefix)/README - rm -f $(prefix)/README.orig - $(CPMAC) $(SCRIPT_EXEC) $(prefix)/dlxlinux - for i in $(TEXT_FILE_LIST); do mv $(prefix)/$$i $(prefix)/$$i.txt; done +install_macosx: all download_dlx install_man @INSTALL_DOCBOOK_VAR@ + -mkdir -p $(DESTDIR)$(prefix) + for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r $$i $(DESTDIR)$(sharedir); else $(CPMAC) -r $(srcdir)/$$i $(DESTDIR)$(sharedir); fi; done + $(CPMAC) $(srcdir)/.bochsrc $(DESTDIR)$(sharedir)/bochsrc-sample.txt + -mkdir $(DESTDIR)$(sharedir)/keymaps + $(CPMAC) $(srcdir)/gui/keymaps/*.map $(DESTDIR)$(sharedir)/keymaps + cat $(DLXLINUX_TAR) | (cd $(DESTDIR)$(sharedir) && tar xzvf -) + dlxrc=$(DESTDIR)$(sharedir)/dlxlinux/bochsrc.txt; mv "$$dlxrc" "$$dlxrc.orig" && sed < "$$dlxrc.orig" 's/\/usr\/local\/bochs\/latest/../' > "$$dlxrc" && rm -f "$$dlxrc.orig" + mv $(srcdir)/README $(srcdir)/README.orig + cat $(srcdir)/build/macosx/README.macosx-binary $(srcdir)/README.orig > $(DESTDIR)$(sharedir)/README + rm -f $(DESTDIR)$(sharedir)/README.orig + $(CPMAC) $(SCRIPT_EXEC) $(DESTDIR)$(sharedir)/dlxlinux +# for i in $(TEXT_FILE_LIST); do mv $(srcdir)/$$i $(DESTDIR)$(sharedir)/$$i.txt; done ########################################### # BeOS make target.