From 49da88cc99ffe632fa4708d420118b6d4b837b71 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 23 Nov 1999 15:53:09 +0000
Subject: Patch rtems-rc-19991117-16.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de>:

  * the PACKHEX etc problem
  * prevents the *.rels being removed inside the build-tree
  * a typo which only shows for when MP is activated
  * Alters some custom/*cfg files
---
 make/custom/gen68360.cfg | 6 +++---
 make/custom/gensh1.cfg   | 6 +++---
 make/custom/gensh2.cfg   | 6 +++---
 make/host.cfg.in         | 6 ++++++
 4 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'make')

diff --git a/make/custom/gen68360.cfg b/make/custom/gen68360.cfg
index c78a4b5743..75defe32b8 100644
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -79,10 +79,10 @@ endef
 else
 
 define make-exe
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $(basename $@).exe \
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -g -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
+	$(NM) -g -n $@ > $(basename $@).num
+	$(SIZE) $@
 endef
 endif
 
diff --git a/make/custom/gensh1.cfg b/make/custom/gensh1.cfg
index f4145d2609..1b52be1c2a 100644
--- a/make/custom/gensh1.cfg
+++ b/make/custom/gensh1.cfg
@@ -72,10 +72,10 @@ endef
 else
 define make-exe
 	$(LINK.c) -Wl,-Map,$(basename $@).map \
-	    $(LDLIBS) -o $(basename $@).exe \
+	    $(LDLIBS) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
+	$(NM) -n $@ > $(basename $@).num
+	$(SIZE) $@
 endef
 endif
 
diff --git a/make/custom/gensh2.cfg b/make/custom/gensh2.cfg
index a03f7a950c..f4596f26a1 100644
--- a/make/custom/gensh2.cfg
+++ b/make/custom/gensh2.cfg
@@ -76,10 +76,10 @@ endef
 else
 define make-exe
 	$(LINK.c) -Wl,-Map,$(basename $@).map \
-	    $(LDLIBS) -o $(basename $@).exe \
+	    $(LDLIBS) -o $@ \
 	    $(LINK_OBJS) $(LINK_LIBS)
-	$(NM) -n $(basename $@).exe > $(basename $@).num
-	$(SIZE) $(basename $@).exe
+	$(NM) -n $@ > $(basename $@).num
+	$(SIZE) $@
 endef
 endif
 
diff --git a/make/host.cfg.in b/make/host.cfg.in
index c048042977..cae07de613 100644
--- a/make/host.cfg.in
+++ b/make/host.cfg.in
@@ -30,9 +30,13 @@ SED=sed
 # M4=@M4@
 
 # Global tools
+ifndef PACKHEX
 PACKHEX=$(PROJECT_BIN)/packhex
+endif
 
+ifndef INSTALL_CHANGE
 INSTALL_CHANGE=$(PROJECT_BIN)/install-if-change
+endif
 INSTALL_VARIANT=$(INSTALL_CHANGE) -V "$(LIB_VARIANT)"
 
 # FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
@@ -71,4 +75,6 @@ INSTLIBFLAGS  = -m 0644
 INSTDIRFLAGS  = -m 0755 -d
 INSTINCFLAGS  = -m 0644
 
+ifndef INSTALL_DATA
 INSTALL_DATA = $(INSTALL) $(INSTDATAFLAGS)
+endif
-- 
cgit v1.2.3