- use 'install' instead of 'cp' during installation (based on SF patch #1152808
by Avi Kivity) - added TODO to list of files to install - uninstall target now removes plugins, too
This commit is contained in:
parent
031cd64827
commit
9ddf44f35a
@ -48,13 +48,13 @@ REL_STRING=@REL_STRING@
|
||||
MAN_PAGE_1_LIST=bochs bximage bxcommit bochs-dlx
|
||||
MAN_PAGE_5_LIST=bochsrc
|
||||
INSTALL_LIST_SHARE=bios/BIOS-* bios/VGABIOS* @INSTALL_LIST_FOR_PLATFORM@
|
||||
INSTALL_LIST_DOC=CHANGES COPYING README
|
||||
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
|
||||
# for win32 and macosx, these files get renamed to *.txt in install process
|
||||
TEXT_FILE_LIST=README CHANGES COPYING VGABIOS-elpin-LICENSE VGABIOS-lgpl-README
|
||||
TEXT_FILE_LIST=README CHANGES COPYING TODO VGABIOS-elpin-LICENSE VGABIOS-lgpl-README
|
||||
CP=cp
|
||||
CAT=cat
|
||||
RM=rm
|
||||
@ -244,7 +244,7 @@ $(BX_OBJS): $(BX_INCLUDES)
|
||||
bxversion.h:
|
||||
$(RM) -f bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.170 2005-01-05 19:50:52 vruppert Exp $$' >> bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.171 2005-03-05 21:02:59 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
|
||||
@ -349,13 +349,13 @@ install_unix: install_bin @INSTALL_PLUGINS_VAR@ install_man install_share instal
|
||||
|
||||
install_bin::
|
||||
for i in $(DESTDIR)$(bindir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
for i in $(INSTALL_LIST_BIN); do if test -f $$i; then cp $$i $(DESTDIR)$(bindir); else cp $(srcdir)/$$i $(DESTDIR)$(bindir); fi; done
|
||||
-for i in $(INSTALL_LIST_BIN_OPTIONAL); do if test -f $$i; then cp $$i $(DESTDIR)$(bindir); else cp $(srcdir)/$$i $(DESTDIR)$(bindir); fi; done
|
||||
for i in $(INSTALL_LIST_BIN); do if test -f $$i; then install $$i $(DESTDIR)$(bindir); else install $(srcdir)/$$i $(DESTDIR)$(bindir); fi; done
|
||||
-for i in $(INSTALL_LIST_BIN_OPTIONAL); do if test -f $$i; then install $$i $(DESTDIR)$(bindir); else install $(srcdir)/$$i $(DESTDIR)$(bindir); fi; done
|
||||
|
||||
install_libtool_plugins::
|
||||
for i in $(DESTDIR)$(plugdir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
list=`cd gui && echo *.la`; for i in $$list; do $(LIBTOOL) --mode=install cp gui/$$i $(DESTDIR)$(plugdir); done
|
||||
list=`cd iodev && echo *.la`; for i in $$list; do $(LIBTOOL) --mode=install cp iodev/$$i $(DESTDIR)$(plugdir); done
|
||||
list=`cd gui && echo *.la`; for i in $$list; do $(LIBTOOL) --mode=install install gui/$$i $(DESTDIR)$(plugdir); done
|
||||
list=`cd iodev && echo *.la`; for i in $$list; do $(LIBTOOL) --mode=install install iodev/$$i $(DESTDIR)$(plugdir); done
|
||||
$(LIBTOOL) --finish $(DESTDIR)$(plugdir)
|
||||
|
||||
install_dll_plugins::
|
||||
@ -365,16 +365,16 @@ install_dll_plugins::
|
||||
|
||||
install_share::
|
||||
for i in $(DESTDIR)$(sharedir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
for i in $(INSTALL_LIST_SHARE); do if test -f $$i; then cp $$i $(DESTDIR)$(sharedir); else cp $(srcdir)/$$i $(DESTDIR)$(sharedir); fi; done
|
||||
for i in $(INSTALL_LIST_SHARE); do if test -f $$i; then install -m 644 $$i $(DESTDIR)$(sharedir); else install -m 644 $(srcdir)/$$i $(DESTDIR)$(sharedir); fi; done
|
||||
-mkdir $(DESTDIR)$(sharedir)/keymaps
|
||||
for i in $(srcdir)/gui/keymaps/*.map; do cp $$i $(DESTDIR)$(sharedir)/keymaps/; done
|
||||
for i in $(srcdir)/gui/keymaps/*.map; do install -m 644 $$i $(DESTDIR)$(sharedir)/keymaps/; done
|
||||
|
||||
install_doc::
|
||||
for i in $(DESTDIR)$(docdir); do mkdir -p $$i && test -d $$i && test -w $$i; done
|
||||
for i in $(INSTALL_LIST_DOC); do if test -f $$i; then cp $$i $(DESTDIR)$(docdir); else cp $(srcdir)/$$i $(DESTDIR)$(docdir); fi; done
|
||||
for i in $(INSTALL_LIST_DOC); do if test -f $$i; then install -m 644 $$i $(DESTDIR)$(docdir); else install -m 644 $(srcdir)/$$i $(DESTDIR)$(docdir); fi; done
|
||||
$(RM) -f $(DESTDIR)$(docdir)/README
|
||||
$(CAT) $(srcdir)/build/linux/README.linux-binary $(srcdir)/README > $(DESTDIR)$(docdir)/README
|
||||
$(CP) $(srcdir)/.bochsrc $(DESTDIR)$(docdir)/bochsrc-sample.txt
|
||||
install -m 644 $(srcdir)/.bochsrc $(DESTDIR)$(docdir)/bochsrc-sample.txt
|
||||
|
||||
|
||||
build_docbook::
|
||||
@ -416,6 +416,7 @@ install_dlx:
|
||||
uninstall::
|
||||
$(RM) -rf $(DESTDIR)$(sharedir)
|
||||
$(RM) -rf $(DESTDIR)$(docdir)
|
||||
$(RM) -rf $(DESTDIR)$(libdir)/bochs
|
||||
for i in bochs bximage bxcommit bochs-dlx; do rm -f $(DESTDIR)$(bindir)/$$i; done
|
||||
for i in $(MAN_PAGE_1_LIST); do $(RM) -f $(man1dir)/$$i.1.gz; done
|
||||
for i in $(MAN_PAGE_5_LIST); do $(RM) -f $(man5dir)/$$i.5.gz; done
|
||||
|
Loading…
Reference in New Issue
Block a user