- I have tried to make the --prefix argument to configure control
everything about the installation path. There should be no more hardcoded references to /usr/local/bochs. Instead, there are references to @prefix@ which get replaced by the configure script with the real prefix.
This commit is contained in:
Bryce Denney
parent
9a04460e23
commit
473e3f1c88
@ -33,9 +33,9 @@ man1dir = $(mandir)/man1
|
||||
|
||||
DESTDIR =
|
||||
|
||||
VERSION=1.2.cvs
|
||||
VER_STRING=cvs-snapshot
|
||||
REL_STRING=
|
||||
VERSION=@VERSION@
|
||||
VER_STRING=@VER_STRING@
|
||||
REL_STRING=@REL_STRING@
|
||||
BOCHSDIR=$(prefix)/bochs
|
||||
VERSIONDIR=$(BOCHSDIR)/$(VERSION)
|
||||
MAN_PAGE_LIST=bochs bochsrc bximage bochs-dlx
|
||||
@ -191,7 +191,7 @@ $(BX_OBJS): $(BX_INCLUDES)
|
||||
bxversion.h:
|
||||
$(RM) -f bxversion.h
|
||||
echo '/////////////////////////////////////////////////////////////////////////' > bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.54 2001-11-10 01:35:58 bdenney Exp $$' >> bxversion.h
|
||||
echo '// $$Id: Makefile.in,v 1.55 2001-11-10 03:48:22 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
|
||||
@ -298,8 +298,9 @@ install_bin::
|
||||
-mkdir -p $(DESTDIR)$(bindir)
|
||||
test -d $(DESTDIR)$(VERSIONDIR)
|
||||
test -w $(DESTDIR)$(VERSIONDIR)
|
||||
for i in bochs-docs; do cat $(srcdir)/build/linux/$$i | $(SED) -e 's/@VERSION@/$(VERSION)/g' -e 's,/usr/local,$(prefix),g' > $(DESTDIR)$(bindir)/$$i; $(CHMOD) 755 $(DESTDIR)$(bindir)/$$i; done
|
||||
for i in $(INSTALL_LIST_SED); do cat $(srcdir)/build/linux/$$i | $(SED) -e 's/@VERSION@/$(VERSION)/g' > $(DESTDIR)$(VERSIONDIR)/$$i; $(CHMOD) 644 $(DESTDIR)$(VERSIONDIR)/$$i; done
|
||||
for i in bochs-docs; do cp $(srcdir)/build/linux/$$i $(DESTDIR)$(bindir)/$$i; $(CHMOD) 755 $(DESTDIR)$(bindir)/$$i; done
|
||||
for i in $(INSTALL_LIST_SED); do cp $(srcdir)/build/linux/$$i $(DESTDIR)$(VERSIONDIR)/$$i; $(CHMOD) 644 $(DESTDIR)$(VERSIONDIR)/$$i; done
|
||||
$(CHMOD) a+x install-x11-fonts test-x11-fonts
|
||||
for i in $(INSTALL_LIST); do if test -f $$i; then cp $$i $(DESTDIR)$(VERSIONDIR); else cp $(srcdir)/$$i $(DESTDIR)$(VERSIONDIR); fi; done
|
||||
$(LN_S) $(VERSIONDIR)/bochs $(DESTDIR)$(bindir)/bochs
|
||||
$(LN_S) $(VERSIONDIR)/bximage $(DESTDIR)$(bindir)/bximage
|
||||
@ -332,7 +333,7 @@ install_dlx::
|
||||
$(CHOWN) -R root.root $(BOCHSDIR)/dlxlinux
|
||||
$(CHMOD) 755 $(BOCHSDIR)/dlxlinux
|
||||
$(CHMOD) 644 $(BOCHSDIR)/dlxlinux/*
|
||||
for i in bochs-dlx; do cat $(srcdir)/build/linux/$$i | $(SED) -e 's/@VERSION@/$(VERSION)/g' -e 's,/usr/local,$(prefix),g' > $(bindir)/$$i; $(CHMOD) 755 $(bindir)/$$i; done
|
||||
for i in bochs-dlx; do cp $(srcdir)/build/linux/$$i $(bindir)/$$i; $(CHMOD) 755 $(bindir)/$$i; done
|
||||
|
||||
uninstall::
|
||||
$(RM) -rf $(VERSIONDIR)
|
||||
@ -355,7 +356,7 @@ rpm:: dist-clean download_dlx
|
||||
test -w $(SOURCES)
|
||||
test -w $(SPECS)
|
||||
rm -f /usr/src/redhat/SPECS/bochs.spec
|
||||
$(CAT) $(RPMSPEC) | $(SED) "s/@VERSION@/$(VERSION)/g" > $(SPECS)/bochs.spec
|
||||
$(CAT) $(RPMSPEC) | $(SED) "s/@SEDVERSION@/$(VERSION)/g" > $(SPECS)/bochs.spec
|
||||
$(RM) -rf $(SOURCES)/bochs
|
||||
$(MKDIR) $(SOURCES)/bochs
|
||||
$(TAR) cf - * .??* | (cd $(SOURCES)/bochs && tar xf -)
|
||||
@ -401,6 +402,7 @@ clean:
|
||||
local-dist-clean: clean
|
||||
@RMCOMMAND@ config.h config.status config.log config.cache
|
||||
@RMCOMMAND@ .dummy `find . -name '*.dsp' -o -name '*.dsw' -o -name '*.opt'`
|
||||
@RMCOMMAND@ bxversion.h install-x11-fonts build/linux/bochs-dlx build/linux/bochs-docs build/linux/DOC-linux.html
|
||||
|
||||
all-clean: clean
|
||||
cd iodev @COMMAND_SEPARATOR@
|
||||
|
||||
@ -91,25 +91,25 @@ text form are shown as links. <br>
|
||||
|
||||
<table align=center border=1>
|
||||
<th>File name </th> <th> Description </th>
|
||||
<tr><td><a href="README ">/usr/local/bochs/@VERSION@/README </a></td> <td> the ReadMe file from the source distribution. </td> </tr>
|
||||
<tr><td><a href="COPYING ">/usr/local/bochs/@VERSION@/COPYING </a></td> <td> copy of the LGPL license </td> </tr>
|
||||
<tr><td><a href="DOC-linux.html ">/usr/local/bochs/@VERSION@/DOC-linux.html </a></td> <td> this file </td> </tr>
|
||||
<tr><td><a href="README ">@prefix@/bochs/@VERSION@/README </a></td> <td> the ReadMe file from the source distribution. </td> </tr>
|
||||
<tr><td><a href="COPYING ">@prefix/bochs/@VERSION@/COPYING </a></td> <td> copy of the LGPL license </td> </tr>
|
||||
<tr><td><a href="DOC-linux.html ">@prefix/bochs/@VERSION@/DOC-linux.html </a></td> <td> this file </td> </tr>
|
||||
<tr><td>/usr/man/man1/* </td> <td> man pages for bochs, bochs-dlx, bochsrc, and bximage </td> </tr>
|
||||
<tr><td><a href="docs-html/index.html ">/usr/local/bochs/@VERSION@/docs-html/* </a></td> <td> a local copy of all Bochs documentation ( <a href="http://bochs.sourceforge.net/docs-html">Online copy</a> )</td> </tr>
|
||||
<tr><td><a href="CHANGES ">/usr/local/bochs/@VERSION@/CHANGES </a></td> <td> what is changed between versions </td> </tr>
|
||||
<tr><td>/usr/local/bochs/@VERSION@/BIOS-bochs-latest </td> <td> ROM BIOS image for Bochs </td> </tr>
|
||||
<tr><td>/usr/local/bochs/@VERSION@/VGABIOS-elpin-2.40 </td> <td> VGA BIOS image for Bochs </td> </tr>
|
||||
<tr><td><a href="VGABIOS-elpin-LICENSE ">/usr/local/bochs/@VERSION@/VGABIOS-elpin-LICENSE </a></td> <td> license for VGA BIOS </td> </tr>
|
||||
<tr><td><a href="bochsrc-sample.txt">/usr/local/bochs/@VERSION@/bochsrc-sample.txt</a></td> <td> sample Bochs configuration file </td> </tr>
|
||||
<tr><td>/usr/local/bin/bochs </td> <td> the main Bochs executable (This is actually a symbolic link to /usr/local/bochs/@VERSION@/bochs) </td> </tr>
|
||||
<tr><td>/usr/local/bin/bximage </td> <td> tool for making new disk images (This is actually a symbolic link to /usr/local/bochs/@VERSION@/bximage)</td> </tr>
|
||||
<tr><td>/usr/local/bin/bochs-docs </td> <td> script to start up browser with this page </td> </tr>
|
||||
<tr><td>/usr/local/bin/bochs-dlx </td> <td> run this script to try out DLX Linux inside Bochs!</td> </tr>
|
||||
<tr><td>/usr/local/bochs/dlxlinux/ </td> <td> directory containing DLX linux sample disk image </td> </tr>
|
||||
<tr><td><a href="../dlxlinux/README ">/usr/local/bochs/dlxlinux/README </a></td> <td> description of DLX linux</td> </tr>
|
||||
<tr><td><a href="../dlxlinux/bochsrc.txt ">/usr/local/bochs/dlxlinux/bochsrc.txt </a></td> <td> Bochs configuration file for DLX</td> </tr>
|
||||
<tr><td>/usr/local/bochs/dlxlinux/hd10meg.img </td> <td> disk image file (10 meg) </td> </tr>
|
||||
<tr><td><a href="../dlxlinux/testform.txt ">/usr/local/bochs/dlxlinux/testform.txt </a></td> <td> Form for reporting success or failure </td> </tr>
|
||||
<tr><td><a href="docs-html/index.html ">@prefix/bochs/@VERSION@/docs-html/* </a></td> <td> a local copy of all Bochs documentation ( <a href="http://bochs.sourceforge.net/docs-html">Online copy</a> )</td> </tr>
|
||||
<tr><td><a href="CHANGES ">@prefix@/bochs/@VERSION@/CHANGES </a></td> <td> what is changed between versions </td> </tr>
|
||||
<tr><td>@prefix@/bochs/@VERSION@/BIOS-bochs-latest </td> <td> ROM BIOS image for Bochs </td> </tr>
|
||||
<tr><td>@prefix@/bochs/@VERSION@/VGABIOS-elpin-2.40 </td> <td> VGA BIOS image for Bochs </td> </tr>
|
||||
<tr><td><a href="VGABIOS-elpin-LICENSE ">@prefix@/bochs/@VERSION@/VGABIOS-elpin-LICENSE </a></td> <td> license for VGA BIOS </td> </tr>
|
||||
<tr><td><a href="bochsrc-sample.txt">@prefix@/bochs/@VERSION@/bochsrc-sample.txt</a></td> <td> sample Bochs configuration file </td> </tr>
|
||||
<tr><td>@prefix@/bin/bochs </td> <td> the main Bochs executable (This is actually a symbolic link to @prefix@/bochs/@VERSION@/bochs) </td> </tr>
|
||||
<tr><td>@prefix@/bin/bximage </td> <td> tool for making new disk images (This is actually a symbolic link to @prefix@/bochs/@VERSION@/bximage)</td> </tr>
|
||||
<tr><td>@prefix@/bin/bochs-docs </td> <td> script to start up browser with this page </td> </tr>
|
||||
<tr><td>@prefix@/bin/bochs-dlx </td> <td> run this script to try out DLX Linux inside Bochs!</td> </tr>
|
||||
<tr><td>@prefix@/bochs/dlxlinux/ </td> <td> directory containing DLX linux sample disk image </td> </tr>
|
||||
<tr><td><a href="../dlxlinux/README ">@prefix@/bochs/dlxlinux/README </a></td> <td> description of DLX linux</td> </tr>
|
||||
<tr><td><a href="../dlxlinux/bochsrc.txt ">@prefix@/bochs/dlxlinux/bochsrc.txt </a></td> <td> Bochs configuration file for DLX</td> </tr>
|
||||
<tr><td>@prefix@/bochs/dlxlinux/hd10meg.img </td> <td> disk image file (10 meg) </td> </tr>
|
||||
<tr><td><a href="../dlxlinux/testform.txt ">@prefix@/bochs/dlxlinux/testform.txt </a></td> <td> Form for reporting success or failure </td> </tr>
|
||||
</table>
|
||||
|
||||
|
||||
@ -217,7 +217,7 @@ to start up DLX Linux.
|
||||
<BR>
|
||||
This script makes it quick and easy to start up DLX Linux within bochs.
|
||||
"bochs-dlx" should run as soon as you install the RPM. All the script actually
|
||||
does is to cd into /usr/local/bochs/dlxlinux and then run bochs from there.
|
||||
does is to cd into @prefix@/bochs/dlxlinux and then run bochs from there.
|
||||
<br><br>
|
||||
|
||||
<font face="arial, helvetica" color="#1e029a" size="3">
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
BOCHS=/usr/local/bin/bochs
|
||||
DLXINST=/usr/local/bochs/dlxlinux
|
||||
GZIP=gzip
|
||||
BOCHS=@prefix@/bin/bochs
|
||||
DLXINST=@prefix@/bochs/dlxlinux
|
||||
GZIP=@GZIP@
|
||||
if [ ! -z $1 ]; then
|
||||
DLXPATH=$1
|
||||
else
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
BROWSER=netscape
|
||||
URL=/usr/local/bochs/@VERSION@/DOC-linux.html
|
||||
MY_PATH=/usr/local/bin/bochs-docs
|
||||
URL=@prefix@/@VERSION@/DOC-linux.html
|
||||
MY_PATH=@prefix@/bin/bochs-docs
|
||||
|
||||
cat <<EOF
|
||||
-----------------------------------------------------
|
||||
@ -1,7 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: bxversion.h,v 1.5 2001-10-03 13:10:37 bdenney Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// This file is generated by "make bxversion.h"
|
||||
#define VER_STRING "cvs-snapshot"
|
||||
#define REL_STRING ""
|
||||
7
bochs/bxversion.h.in
Normal file
7
bochs/bxversion.h.in
Normal file
@ -0,0 +1,7 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// This file is checked in as bxversion.h.in. The configure script
|
||||
// substitutes variables and creates bxversion.h.
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define VER_STRING "@VER_STRING@"
|
||||
#define REL_STRING "@REL_STRING@"
|
||||
9496
bochs/configure
vendored
9496
bochs/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -4,6 +4,12 @@ AC_PREREQ(2.4)
|
||||
AC_INIT(bochs.h)
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
||||
dnl // Put Bochs version information right here so that it gets substituted
|
||||
dnl // into all the right places.
|
||||
VERSION="1.2.cvs"
|
||||
VER_STRING="cvs-snapshot"
|
||||
REL_STRING=""
|
||||
|
||||
changequote(<<, >>)
|
||||
changequote([, ])
|
||||
|
||||
@ -1085,6 +1091,9 @@ AC_SUBST(PRIMARY_TARGET)
|
||||
AC_SUBST(COMMAND_SEPARATOR)
|
||||
AC_SUBST(CD_UP_ONE)
|
||||
AC_SUBST(CD_UP_TWO)
|
||||
AC_SUBST(VERSION)
|
||||
AC_SUBST(VER_STRING)
|
||||
AC_SUBST(REL_STRING)
|
||||
|
||||
AC_PATH_PROG(GZIP, gzip)
|
||||
AC_PATH_PROG(TAR, tar)
|
||||
@ -1092,4 +1101,6 @@ AC_PATH_PROG(TAR, tar)
|
||||
AC_OUTPUT(Makefile iodev/Makefile debug/Makefile bios/Makefile \
|
||||
cpu/Makefile memory/Makefile gui/Makefile disasm/Makefile \
|
||||
${INSTRUMENT_DIR}/Makefile misc/Makefile dynamic/Makefile \
|
||||
fpu/Makefile)
|
||||
fpu/Makefile install-x11-fonts build/linux/bochs-dlx \
|
||||
build/linux/bochs-docs bxversion.h \
|
||||
build/linux/DOC-linux.html)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# install-x11-fonts
|
||||
# $Id: install-x11-fonts,v 1.4 2001-09-30 14:55:20 bdenney Exp $
|
||||
# $Id: install-x11-fonts.in,v 1.1 2001-11-10 03:45:53 bdenney Exp $
|
||||
#
|
||||
# This is designed help people to get the Bochs fonts installed on their
|
||||
# system.
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
X11_FONT_PATH_CHOICES="/usr/X11R6/lib/X11/fonts /usr/local/lib/X11/fonts /usr/lib/X11/fonts /usr/openwin/lib/X11/fonts"
|
||||
FONTS=vga.pcf
|
||||
FONT_SOURCE_PATH_CHOICES="font ${srcdir+$srcdir/font} /usr/local/bochs/latest"
|
||||
FONT_SOURCE_PATH_CHOICES="font ${srcdir+$srcdir/font} @prefix@/bochs/latest"
|
||||
|
||||
die () {
|
||||
cat <<EOF
|
||||
Loading…
x
Reference in New Issue
Block a user