Changeset 56616af3 in rtems


Ignore:
Timestamp:
02/16/00 17:47:48 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Children:
15093362
Parents:
319d298
Message:

Patch rtems-rc-4.5.0-1.diff from Ralf Corsepius <corsepiu@…>
which contains a couple of minor bug fixes:

Fixes:

  • Typos: Use LIB_VARIANT instead of LIBVARIANT
  • Fix pc386.cfg
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • c/src/librdbg/src/i386/any/Makefile.am

    r319d298 r56616af3  
    4242FRONTEND = \"$(RTEMS_CPU)/any/remdeb_f.x\"
    4343
    44 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
     44$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
    4545        $(INSTALL_DATA) $< $@
    4646
    … …  
    8585
    8686TMPINSTALL_FILES += \
    87 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
     87$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
    8888
    8989all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

  • c/src/librdbg/src/powerpc/mcp750/Makefile.am

    r319d298 r56616af3  
    4242FRONTEND = \"$(RTEMS_CPU)/mcp750/remdeb_f.x\"
    4343
    44 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
     44$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
    4545        $(INSTALL_DATA) $< $@
    4646
    … …  
    8585
    8686TMPINSTALL_FILES += \
    87 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
     87$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
    8888
    8989all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)

  • make/custom/pc386.cfg

    r319d298 r56616af3  
    8282        $(NM) -g -n $(basename $@).obj > $(basename $@).num
    8383        $(SIZE) $(basename $@).obj
    84         $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \
     84        test -d ${PROJECT_RELEASE}/BootImgs \
     85          || mkdir ${PROJECT_RELEASE}/BootImgs
     86        cp $(basename $@).bt \
    8587            ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
     88        chmod 755 \
     89          ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
    8690endef
    8791else
    … …  
    101105        $(NM) -g -n $(basename $@).obj > $(basename $@).num
    102106        $(SIZE) $(basename $@).obj
    103         @$(mkinstalldirs) ${PROJECT_RELEASE}/BootImgs
    104         $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \
    105             ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
     107        test -d ${PROJECT_RELEASE}/BootImgs \
     108          || mkdir ${PROJECT_RELEASE}/BootImgs
     109        f=`basename $@ .exe`; \
     110        cp $(basename $@).bt \
     111            ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
     112        && chmod 755 \
     113          ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt
    106114        $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \
    107115            -o $@ $(LINK_OBJS) $(LINK_LIBS)
    … …  
    122130        $(NM) -g -n $(basename $@).obj > $(basename $@).num
    123131        $(SIZE) $(basename $@).obj
    124         $(INSTALL_PROGRAM) -D -m 555 $(basename $@).bt \
    125             ${PROJECT_RELEASE}/BootImgs/$(basename $@)$(LIB_VARIANT).bt
     132        test -d ${PROJECT_RELEASE}/BootImgs \
     133          || mkdir ${PROJECT_RELEASE}/BootImgs
     134        f=`basename $@ .exe`; \
     135        cp $(basename $@).bt \
     136            ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt \
     137        && chmod 755 \
     138          ${PROJECT_RELEASE}/BootImgs/$${f}$(LIB_VARIANT).bt
    126139        $(CXX) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_LD) -Wl,-Ttext,$(RELOCADDR) \
    127140            -o $(basename $@).coff $(LINK_OBJS) $(LINK_LIBS)
Note: See TracChangeset for help on using the changeset viewer.