summaryrefslogtreecommitdiff
path: root/wortel
diff options
context:
space:
mode:
authorneal <neal>2004-11-17 16:31:17 +0000
committerneal <neal>2004-11-17 16:31:17 +0000
commit6a30f88a0e4e55a64b169683867939c962eea1f4 (patch)
treee52eb9432b27cf344951a947b1dd483f8587952d /wortel
parent1742c541aba8b5b4a9677ae532e96ea07c9fa526 (diff)
deva/
2004-11-17 Neal H. Walfield <neal@gnu.org> * Makefile.am (bootdir): New variable. (boot_PROGRAMS): Use this instead of noinst_PROGRAMS. laden/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * Makefile.am (bootdir): New variable. (boot_PROGRAMS): Use this instead of noinst_PROGRAMS. physmem/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * Makefile.am (bootdir): New variable. (boot_PROGRAMS): Use this instead of noinst_PROGRAMS. task/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * Makefile.am (bootdir): New variable. (boot_PROGRAMS): Use this instead of noinst_PROGRAMS. wortel/ 2004-11-17 Neal H. Walfield <neal@gnu.org> * Makefile.am (bootdir): New variable. (boot_PROGRAMS): Use this instead of noinst_PROGRAMS.
Diffstat (limited to 'wortel')
-rw-r--r--wortel/ChangeLog5
-rw-r--r--wortel/Makefile.am5
2 files changed, 8 insertions, 2 deletions
diff --git a/wortel/ChangeLog b/wortel/ChangeLog
index 0469d07..2966fa9 100644
--- a/wortel/ChangeLog
+++ b/wortel/ChangeLog
@@ -1,5 +1,10 @@
2004-11-17 Neal H. Walfield <neal@gnu.org>
+ * Makefile.am (bootdir): New variable.
+ (boot_PROGRAMS): Use this instead of noinst_PROGRAMS.
+
+2004-11-17 Neal H. Walfield <neal@gnu.org>
+
* output.h (debug): Include program_name and __FUNCTION__ in
output.
diff --git a/wortel/Makefile.am b/wortel/Makefile.am
index e0d61b3..75b30bd 100644
--- a/wortel/Makefile.am
+++ b/wortel/Makefile.am
@@ -1,5 +1,5 @@
# Makefile.am - Makefile template for wortel.
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
# Written by Marcus Brinkmann.
#
# This file is part of the GNU Hurd.
@@ -24,7 +24,8 @@ if ARCH_IA32
STARTUP_ARCH_SOURCES = ia32-startup.S
endif
-noinst_PROGRAMS = startup wortel
+bootdir = $(prefix)/boot
+boot_PROGRAMS = startup wortel
# The startup "program" is glue code that is injected into a new task
# started by wortel. It is responsible for mapping in the from the