summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-12-01 14:27:58 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-12-01 14:27:58 +0000
commit7dd4054e86a725e1550fa0220f1bfabdd85d7af9 (patch)
treea1653072a5861f0d7f1cf1348b01c1dbaf693814
parentPatch rtems-rc-19991123-rc-1.diff from Ralf Corsepius (diff)
downloadrtems-7dd4054e86a725e1550fa0220f1bfabdd85d7af9.tar.bz2
Patch rtems-rc-19991123-rc-1.diff from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> which implements automake support for some score/cpu/<RTEMS_CPU> subdirectories and fixes a few minor configuration bugs. To apply: rm -rf c/src/exec/score/cpu/i960/wrap rm -rf c/src/exec/score/cpu/m68k/wrap rm -rf c/src/exec/score/cpu/sh/wrap rm -rf c/src/exec/score/cpu/sparc/wrap rm -rf c/src/exec/score/cpu/unix/wrap patch -p1 < rtems-rc-19991123-rc-1.diff ./bootstrap Known bugs: * "make debug|profile" in c/src/src/score/cpu/<RTEMS_CPU/Makefile does not handle recursion to subdirectories correctly (recurses too often). However, this issue is hardly visible and should be tolerable for the moment.
Diffstat (limited to '')
-rw-r--r--automake/lib.am2
-rw-r--r--make/leaf.cfg5
2 files changed, 5 insertions, 2 deletions
diff --git a/automake/lib.am b/automake/lib.am
index 85c8c09e95..da5b33b5cc 100644
--- a/automake/lib.am
+++ b/automake/lib.am
@@ -12,7 +12,7 @@ endef
TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib
-$(PROJECT_INCLUDE)/lib:
+$(PROJECT_RELEASE)/lib:
@$(mkinstalldirs) $@
.PRECIOUS: $(LIB)
diff --git a/make/leaf.cfg b/make/leaf.cfg
index e96c68732b..88f708cac8 100644
--- a/make/leaf.cfg
+++ b/make/leaf.cfg
@@ -109,9 +109,12 @@ distclean-am: distclean-generic clean-am
preinstall-am:
preinstall: preinstall-am
+ifndef AUTOMAKE
distclean: distclean-am
- -$(RM) config.status
+ -$(RM) ./config.status
+
clean: clean-am
+endif
.PHONY: distclean distclean-am
.PHONY: clean clean-am