From 511374e4189b0bafbb7efa63dedd4b7626b5c595 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Sat, 25 Nov 2000 20:06:11 +0000
Subject: 2000-11-25	Joel Sherrill <joel@OARcorp.com>

	* custom/pc386.cfg: make-exe rule would write into
	$(PROJECT_RELEASE) area.  This is not cool because it $(PROJECT_RELEASE)
	is generally not writeable after the BSP is installed and you do not
	want every application installed there by default.  Reported by
	Eric Norum <eric.norum@usask.ca>.
---
 make/ChangeLog        |  8 ++++++++
 make/custom/pc386.cfg | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 25 deletions(-)

(limited to 'make')

diff --git a/make/ChangeLog b/make/ChangeLog
index 9bb6184e74..6d8531cee5 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,4 +1,12 @@
 
+2000-11-25	Joel Sherrill <joel@OARcorp.com>
+
+	* custom/pc386.cfg: make-exe rule would write into
+	$(PROJECT_RELEASE) area.  This is not cool because it $(PROJECT_RELEASE)
+	is generally not writeable after the BSP is installed and you do not
+	want every application installed there by default.  Reported by
+	Eric Norum <eric.norum@usask.ca>.
+
 2000-11-25	Joel Sherrill <joel@OARcorp.com>
 
 	* custom/Makefile.am: Updated to add jmr3904.cfg
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg
index 94127a9bd4..ad69be1bd0 100644
--- a/make/custom/pc386.cfg
+++ b/make/custom/pc386.cfg
@@ -68,12 +68,12 @@ define make-exe
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
 	$(NM) -g -n $(basename $@).obj > $(basename $@).num
 	$(SIZE) $(basename $@).obj
-	test -d ${PROJECT_RELEASE}/BootImgs \
-	  || mkdir ${PROJECT_RELEASE}/BootImgs
-        cp $(basename $@).bt \
-	    ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
-	chmod 755 \
-	  ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt 
+#	test -d ${PROJECT_RELEASE}/BootImgs \
+#	  || mkdir ${PROJECT_RELEASE}/BootImgs
+#        cp $(basename $@).bt \
+#	    ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
+#	chmod 755 \
+#	  ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt 
 endef
 else
 define make-exe
@@ -90,15 +90,15 @@ define make-exe
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
 	$(NM) -g -n $(basename $@).obj > $(basename $@).num
 	$(SIZE) $(basename $@).obj
-	test -d ${PROJECT_RELEASE}/BootImgs \
-	  || mkdir ${PROJECT_RELEASE}/BootImgs
-	f=`basename $@ .exe`; \
-        cp $(basename $@).bt \
-	    ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
-	&& chmod 755 \
-	  ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt 
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Ttext,$(RELOCADDR) \
-	    -o $@ $(LINK_OBJS) $(LINK_LIBS)
+#	test -d ${PROJECT_RELEASE}/BootImgs \
+#	  || mkdir ${PROJECT_RELEASE}/BootImgs
+#	f=`basename $@ .exe`; \
+#        cp $(basename $@).bt \
+#	    ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
+#	&& chmod 755 \
+#	  ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt 
+#	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Ttext,$(RELOCADDR) \
+#	    -o $@ $(LINK_OBJS) $(LINK_LIBS)
 endef
 define make-cxx-exe
 	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \
@@ -114,16 +114,16 @@ define make-cxx-exe
 	  $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0
 	$(NM) -g -n $(basename $@).obj > $(basename $@).num
 	$(SIZE) $(basename $@).obj
-	test -d ${PROJECT_RELEASE}/BootImgs \
-	  || mkdir ${PROJECT_RELEASE}/BootImgs
-	f=`basename $@ .exe`; \
-        cp $(basename $@).bt \
-	    ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
-	&& chmod 755 \
-	  ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt 
-	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \
-	    -Wl,-Ttext,$(RELOCADDR) \
-	    -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS)
+#	test -d ${PROJECT_RELEASE}/BootImgs \
+#	  || mkdir ${PROJECT_RELEASE}/BootImgs
+#	f=`basename $@ .exe`; \
+#        cp $(basename $@).bt \
+#	    ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
+#	&& chmod 755 \
+#	  ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt 
+#	$(LINK.cc) $(AM_CFLAGS) $(AM_CXXFLAGS) $(AM_LDFLAGS) \
+#	    -Wl,-Ttext,$(RELOCADDR) \
+#	    -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS)
 endef
 endif
 
-- 
cgit v1.2.3