diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
| commit | 8548fe0ae29eafea856090e742c1fd205ed4b0fb (patch) | |
| tree | b0f3515dadfdea2a2e12a587ea5a2adaab2229db /c/Makefile.in | |
| parent | Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff) | |
| download | rtems-8548fe0ae29eafea856090e742c1fd205ed4b0fb.tar.bz2 | |
Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
> 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).
Diffstat (limited to 'c/Makefile.in')
| -rw-r--r-- | c/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/c/Makefile.in b/c/Makefile.in index 86224be989..ec2f316314 100644 --- a/c/Makefile.in +++ b/c/Makefile.in @@ -20,6 +20,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg @@ -73,8 +75,7 @@ BSP_SPECS_DIR = $(RTEMS_ROOT)/c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY) endif $(BSP_SPECS): $(BSP_SPECS_DIR)/bsp_specs - cp $< $@ - chmod 444 $@ + $(INSTALL) $(INSTDATAFLAGS) $< $@ # Make all/install must include 'env' # if something is added to TARGET_VARIANTS, then account for it here @@ -141,8 +142,7 @@ $(PROJECT_ROOT)/$(RTEMS_BSP)/Makefile.inc: $(PROJECT_ROOT)/make/Templates/Makefi # the tests directory. This significantly minimizes the install size. install_files: $(PROJECT_ROOT)/$(RTEMS_BSP)/Makefile.inc - -$(MKDIR) $(prefix)/ - -$(MKDIR) $(prefix)/rtems + @top_srcdir@/mkinstalldirs $(prefix)/rtems -$(RM) -rf $(prefix)/rtems/$(RTEMS_BSP) cd ../; tar cf - $(RTEMS_BSP)/[bilsuM]* | \ (cd $(prefix)/rtems; tar xpBf - ) |