Commit Graph

16 Commits

Author SHA1 Message Date
jkh
87fd768abf Set X11BASE to something deliberately bogus in elf_buildworld so that
it doesn't link with a.out X11 libs.

Noticed by:	Arno J. Klaassen <arno@heho.snv.jussieu.fr>
1999-03-23 08:09:25 +00:00
msmith
64dde860b4 Use ${MAKE} not 'make -f'
Submitted by:	tfreak@fluffybunny.jaded.net
1999-02-17 20:56:09 +00:00
jkh
2e6248769e Make sure correct path is set in upgrade.
Submitted by:		Ruslan Ermilov <ru@ucb.crimea.ua>
1999-02-13 18:49:02 +00:00
jkh
5d8d3b87c1 further refine the upgrade process. 1999-01-27 15:08:05 +00:00
jkh
5429c9828c Sigh, now I see where the tabs got smashed. Fix them here too. 1999-01-27 08:49:53 +00:00
jkh
8ff9fc2177 Frob the upgrade target to be a bit more inclusive. This appears to
be a good bit more successful at doing automated upgrades than the
previous aout-to-elf target, anyway.  I'll MF3 in a couple of days
depending on how this does.
1999-01-26 09:12:21 +00:00
peter
389217999a Fix an aout-to-elf upgrade failure. Don't let the kernel Makefile
think it's in ELF mode and upgrading /kernel.
1999-01-25 01:47:49 +00:00
peter
438d7c9f8e The upgrade process from 2.2.x -> 3.0-ELF assumes the existence of
GENERICupgrade, which got kinda fried.  Try to copy GENERIC if the
user has not supplied their own.
1999-01-07 07:20:41 +00:00
peter
2a1a5fb618 make aout-to-elf first does an a.out makeworld to bring the current
environment and tools up to date so it can then build an ELF world.
Teach it to cope with the a.out disable.
1999-01-07 06:30:14 +00:00
peter
837611366f 3.0-RELEASE and now the post-release 3.0-CURRENT were being declared
'too old' to run ELF.  Check the kernel version properly.
1998-10-17 05:40:46 +00:00
jb
0a75a57da2 Change 3.0-CURRENT to 3.0-BETA when deciding if the installed system
is current-enough (or is that beta-enough?).

Add a NOCONFIRM test for those brave souls who are game to upgrade
a system in blind faith.
1998-09-23 01:46:25 +00:00
jb
6771aa16b0 Add a move-aout-libs target to do just that. It takes the well known
library directories: /usr/lib /usr/lib/compat /usr/local/lib and
/usr/X11R6/lib and adds any other directories that ldconfig knows
about, then removes any that are already aout directories (that is,
with aout as a component of the path) and passes this directory
list to the move_aout_libs.sh script to do the hack (believe it,
it moves libraries that are in use) work.
1998-09-09 06:02:31 +00:00
jb
741d27581b Change a hardcoded i386 reference to ${MACHINE} so that MACHINE=pc98
is supported properly.
1998-09-05 08:10:44 +00:00
jb
21bff49281 When creating /etc/objformat, respect DESTDIR.
Pointed out by: Zach Heilig -- zach@gaffaneys.com
1998-09-03 21:16:15 +00:00
jb
116f00b602 Force the upgrade kernel to be aout. 1998-08-31 20:22:07 +00:00
jb
0654111216 E-day build system changes.
- Moved most of the guts of Makefile to Makefile.inc1 to become the
  backend for the build system.
- The new Makefile doesn't suffer from problems including the wrong
  sys.mk because it doesn't use anything in there or bsd.own.mk. So,
  from now on, the proper build command is just `make world' (or
  buildworld).
- The intermediate makefiles called Makefile.inc0 and Makefile.upgrade
  fiddle with the OBJFORMAT and MAKEOBJDIRPREFIX variables so that
  both aout and elf object trees can coexist. Makefile.upgrade contains
  the aout->elf transition build.
- A cross build environment is now very close to reality. Specifying
  TOOLDIR, setting OBJFORMAT and MAKEOBJDIRPREFIX allow that.

See the comments in Makefile for more info.
1998-08-31 01:08:08 +00:00