summaryrefslogtreecommitdiff
path: root/laden
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 /laden
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 'laden')
-rw-r--r--laden/ChangeLog5
-rw-r--r--laden/Makefile.am5
2 files changed, 8 insertions, 2 deletions
diff --git a/laden/ChangeLog b/laden/ChangeLog
index 132c612..366059c 100644
--- a/laden/ChangeLog
+++ b/laden/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/laden/Makefile.am b/laden/Makefile.am
index 84e858a..13dd0b9 100644
--- a/laden/Makefile.am
+++ b/laden/Makefile.am
@@ -1,5 +1,5 @@
# Makefile.am - Makefile template for laden.
-# 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.
@@ -23,7 +23,8 @@ if ARCH_IA32
ia32-output.c output-vga.c output-serial.c ia32-shutdown.c
endif
-noinst_PROGRAMS = laden
+bootdir = $(prefix)/boot
+boot_PROGRAMS = laden
laden_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/libc-parts $(AM_CPPFLAGS)