diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-16 17:47:48 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-16 17:47:48 +0000 |
commit | 56616af3106e70f215c6de442ed4aa5ac225811b (patch) | |
tree | d8744057e46472408910982812639b2cb30e0708 /make | |
parent | Changed <= to < to prevent overindexing array of file control blocks (diff) | |
download | rtems-56616af3106e70f215c6de442ed4aa5ac225811b.tar.bz2 |
Patch rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
which contains a couple of minor bug fixes:
Fixes:
* Typos: Use LIB_VARIANT instead of LIBVARIANT
* Fix pc386.cfg
Diffstat (limited to 'make')
-rw-r--r-- | make/custom/pc386.cfg | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/make/custom/pc386.cfg b/make/custom/pc386.cfg index fcc7697fbe..b6edacea8d 100644 --- a/make/custom/pc386.cfg +++ b/make/custom/pc386.cfg @@ -81,8 +81,12 @@ define make-exe $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj - $(INSTALL_PROGRAM) -D -m 555 $(basename $@).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 @@ -100,9 +104,13 @@ define make-exe $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj - @$(mkinstalldirs) ${PROJECT_RELEASE}/BootImgs - $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \ - ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt + 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 $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ -o $@ $(LINK_OBJS) $(LINK_LIBS) endef @@ -121,8 +129,13 @@ define make-cxx-exe $(START16FILE) $(START16ADDR) 0 $(basename $@).bin $(RELOCADDR) 0 $(NM) -g -n $(basename $@).obj > $(basename $@).num $(SIZE) $(basename $@).obj - $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \ - ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt + 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 $(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \ -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS) endef |