Changeset 8548fe0 in rtems for make


Ignore:
Timestamp:
Feb 18, 1999, 6:36:05 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
39136318
Parents:
7908ba5b
Message:

Part of the automake VI patch from Ralf Corsepius <corsepiu@…>:

5) rtems-rc-19990202-1.diff/reorg-install.sh

reorg-install.sh fixes a Makefile variable name clash of RTEMS
configuration files and automake/autoconf standards.
Until now, RTEMS used $(INSTALL) for install-if-change. Automake and
autoconf use $(INSTALL) for a bsd-compatible install. As
install-if-change and bsd-install are not compatible, I renamed all
references to install-if-changed to $(INSTALL_CHANGED) and used
$(INSTALL) for bsd-install (==automake/autoconf standard). When
automake will be introduced install-if-change will probably be replaced
by $(INSTALL) and therefore will slowly vanish. For the moment, this
patch fixes a very nasty problem which prevents adding any automake file
until now (There are still more).

Location:
make
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • make/Makefile.in

    r7908ba5b r8548fe0  
    1111RTEMS_ROOT = @top_srcdir@
    1212PROJECT_ROOT = @PROJECT_ROOT@
     13
     14INSTALL = @INSTALL@
    1315
    1416include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
     
    5961
    6062$(prefix)/rtems:
    61         @INSTALL@ $(INSTDIRFLAGS) $@
     63        @top_srcdir@/mkinstalldirs $@
    6264
    6365install: $(prefix)/rtems \
     
    6971
    7072$(prefix)/rtems/make:
    71         @INSTALL@ $(INSTDIRFLAGS) $@
     73        @top_srcdir@/mkinstalldirs $@
    7274
    7375install_files:: $(GENERIC_FILES) $(MAKEFILES)
    74         @INSTALL@ $(INSTDATAFLAGS) $^ \
     76        $(INSTALL) $(INSTDATAFLAGS) $^ \
    7577        $(prefix)/rtems/make
    7678
    7779$(prefix)/rtems/make/compilers:
    78         @INSTALL@ $(INSTDIRFLAGS) $@
     80        @top_srcdir@/mkinstalldirs $@
    7981
    8082install_files:: $(COMPILER_FILES)
    81         @INSTALL@ $(INSTDATAFLAGS) $^ \
     83        $(INSTALL) $(INSTDATAFLAGS) $^ \
    8284        $(prefix)/rtems/make/compilers
    8385
    8486$(prefix)/rtems/make/custom:
    85         @INSTALL@ $(INSTDIRFLAGS) $@
     87        @top_srcdir@/mkinstalldirs $@
    8688
    8789install_files:: $(CUSTOM_FILES)
    88         @INSTALL@ $(INSTDATAFLAGS) $^ \
     90        $(INSTALL) $(INSTDATAFLAGS) $^ \
    8991        $(prefix)/rtems/make/custom
    9092
    9193$(prefix)/rtems/make/Templates:
    92         @INSTALL@ $(INSTDIRFLAGS) $@
     94        @top_srcdir@/mkinstalldirs $@
    9395
    9496
    9597install_files:: $(TEMPLATE_FILES)
    96         @INSTALL@ $(INSTDATAFLAGS) $^ \
     98        $(INSTALL) $(INSTDATAFLAGS) $^ \
    9799        $(prefix)/rtems/make/Templates
  • make/Templates/Makefile.leaf

    r7908ba5b r8548fe0  
    7373
    7474# Install the program(s), appending _g or _p as appropriate.
    75 # for include files, just use $(INSTALL)
     75# for include files, just use $(INSTALL_CHANGE)
    7676install:  all
    7777        $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin
  • make/Templates/Makefile.lib

    r7908ba5b r8548fe0  
    5555
    5656# Install the library, appending _g or _p as appropriate.
    57 # for include files, just use $(INSTALL)
     57# for include files, just use $(INSTALL_CHANGE)
    5858install:  all
    5959        $(INSTALL_VARIANT) -m 644 ${LIB} ${PROJECT_RELEASE}/lib
  • make/host.cfg.in

    r7908ba5b r8548fe0  
    3434PACKHEX=$(PROJECT_TOOLS)/packhex
    3535
    36 INSTALL=$(PROJECT_TOOLS)/install-if-change
     36INSTALL_CHANGE=$(PROJECT_TOOLS)/install-if-change
    3737INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"
    3838
  • make/target.cfg.in

    r7908ba5b r8548fe0  
    5555BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
    5656 
    57 INSTALL=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
     57INSTALL_CHANGE=$(PROJECT_ROOT)/$(RTEMS_BSP)/build-tools/install-if-change
    5858XCFLAGS=$(CFLAGS_FOR_TARGET)
    5959 
Note: See TracChangeset for help on using the changeset viewer.