Changeset f95d2b53 in rtems


Ignore:
Timestamp:
07/17/98 15:49:12 (25 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
4fb08fd
Parents:
8123c635
Message:

Patch from Ralf Corsepius <corsepiu@…>. Comments:

  • Added support for bsd "install" ($(BSDINSTALL)) to host.cfg.in, i.e. the standard "install" program that most packages (including automake) use. In Makefiles outside of rtems, "install" normally is referenced by $(INSTALL), but rtems already uses $(INSTALL) for install-if-change, hence I used $(BSDINSTALL) instead to keep up backward compatibility.
  • Removed references to @GREP@ etc. from host.cfg.in, as configure.in doesn't check for them (Minor cleanup).
  • Added installation flags INST*FLAGS to host.cfg.in, which should replace -m XXXX flags for installation calls.

*Changes to gcc.cfg to enable it to build host programs from multiple
sources files.
Should not disturb existing sources, but neccessary.

  • There was a not-so-minor bug in the configuration files: "make install" and "make debug_install" don't work in all subdirectories!! I tried to fix this by adding "install" to MTARGETS in main.cfg, which seems to solve most of the problems. But there still seem to be rare (?) cases where "make debug_install" still seems to have problems.
  • Changes to many host related tool-Makefiles to demonstrate the abilities of INST*FLAGS, BSDINSTALL and the new rules in gcc.cfg. ..of cause ... but BSDINSTALL is THE standard method to install files in most program packages besides rtems. This part of the patch fixes some minor protection setting problems, but doesn't support TARGET_VARIANTS

NOTE:
I hope you will like the BSDINSTALL, INST*FLAGS stuff. It is a step to
get rid of "install-if-change" and to rely on a more standard
installation procedure. If you don't like BSDINSTALL, removing it from
the patch isn't difficult- just grep for BSDINSTALL and replace
BSDINSTALL with INSTALL or MKDIR.

FINALLY:
I still have another patch pending (well, not a complete patch yet, it's
a partial patch to demonstrate the principle), which adds automatic
rebuilding of files generated by autoconf/configure. At the moment I
don't dare to submit it, because integrating this patch would require to
modify all Makefile.ins because we'd need to add a new "include " line
to each Makefile.in.

Files:
17 edited

Legend:

Unmodified
Added
Removed

  • c/build-tools/os/msdos/Makefile.in

    r8123c635 rf95d2b53  
    1919
    2020all:    $(DESTDIR) $(PGMS) install
    21         echo $(DESTDIR)
    2221
    2322$(DESTDIR):
    24         [ -d $@ ] || $(MKDIR) $@
     23        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    2524
    2625install:  $(INSTALLED)

  • c/build-tools/scripts/Makefile.in

    r8123c635 rf95d2b53  
    2424
    2525all:    $(DESTDIR) $(PGMS) install
    26         echo $(DESTDIR)
    2726
    2827$(DESTDIR):
    29         [ -d $@ ] || $(MKDIR) $@
     28        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    3029
    3130install:  $(INSTALLED)

  • c/build-tools/src/Makefile.in

    r8123c635 rf95d2b53  
    3333OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    3434
     35# FIXME: building into $(ARCH) doesn't make sense for host programs
    3536PGMS=$(ARCH)/cklength$(EXEEXT) $(ARCH)/eolstrip$(EXEEXT) \
    3637        $(ARCH)/packhex$(EXEEXT) $(ARCH)/unhex$(EXEEXT)
    … …  
    6162CLOBBER_ADDITIONS +=
    6263
    63 all:    $(ARCH) $(SRCS) $(PGMS)
    64         $(INSTALL) -m 555 $(PGMS) ${PROJECT_RELEASE}/build-tools
     64DESTDIR=${PROJECT_RELEASE}/build-tools
     65
     66$(DESTDIR):
     67        $(BSDINSTALL) $(INSTDIRFLAGS) $@
     68
     69all:    $(ARCH) $(DESTDIR) $(SRCS) $(PGMS)
     70        $(BSDINSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR)

  • c/src/exec/score/tools/generic/Makefile.in

    r8123c635 rf95d2b53  
    2323
    2424all:    $(DESTDIR) $(PGMS) install
    25         echo $(DESTDIR)
    2625
    2726$(DESTDIR):
    28         [ -d $@ ] || $(MKDIR) $@
     27        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    2928
    3029install:  $(INSTALLED)
    … …  
    3231# Install the program
    3332$(DESTDIR)/%: %
    34         $(make-script)
     33        $(BSDINSTALL) $(INSTBINFLAGS) $^ $@

  • c/src/exec/score/tools/hppa1.1/Makefile.in

    r8123c635 rf95d2b53  
    5151
    5252all:    ${ARCH} $(SRCS) preinstall $(PGMS)
    53         $(INSTALL) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin
     53        $(INSTALL) $(INSTBINFLAGS) ${PGMS} ${PROJECT_RELEASE}/bin
    5454
    5555# Hack

  • c/src/exec/score/tools/unix/Makefile.in

    r8123c635 rf95d2b53  
    5151
    5252all:    ${ARCH} $(SRCS) $(PGMS)
    53         $(INSTALL) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin
     53        $(BSDINSTALL) $(INSTBINFLAGS) ${PGMS} ${PROJECT_RELEASE}/bin
    5454
    5555preinstall:

  • c/src/make/host.cfg.in

    r8123c635 rf95d2b53  
    3131M4=@M4@
    3232
     33BSDINSTALL=@INSTALL@
    3334INSTALL=$(PROJECT_TOOLS)/install-if-change
    3435INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"
    35 
    36 FGREP=@FGREP@
    37 GREP=@GREP@
    38 EGREP=@EGREP@
    3936
    4037# FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
    … …  
    7168        $(CHMOD) 0555 $@
    7269endef
     70
     71INSTBINFLAGS  = -m 0755
     72INSTDATAFLAGS = -m 0644
     73INSTLIBFLAGS  = -m 0644
     74INSTDIRFLAGS  = -m 0755 -d
     75INSTINCFLAGS  = -m 0644

  • c/update-tools/Makefile.in

    r8123c635 rf95d2b53  
    2525
    2626all:  $(DESTDIR)
    27         echo $(DESTDIR)
    2827
    2928$(DESTDIR):
    30         [ -d $@ ] || $(MKDIR) $@
     29        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    3130
    3231install:  $(INSTALLED)
    3332
    3433# Install the program
     34# FIXME: This isn't correct
    3535$(DESTDIR)/%: %
    3636        $(make-script)
    37         $(INSTALL)  -m 555 $(PERL_PGMS) ${DESTDIR}
    38         $(INSTALL)  -m 444 $(srcdir)/$(MISC_SUPPORT) ${DESTDIR}
     37        $(BSDINSTALL)  $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR}
     38        $(BSDINSTALL)  $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR}

  • configure.in

    r8123c635 rf95d2b53  
    9595AC_PATH_PROG(CHMOD,chmod)
    9696AC_PATH_PROG(SORT,sort)
     97AC_PROG_INSTALL
    9798
    9899dnl check mkdir behaviour, try to get mkdir -p -m 0755

  • make/host.cfg.in

    r8123c635 rf95d2b53  
    3131M4=@M4@
    3232
     33BSDINSTALL=@INSTALL@
    3334INSTALL=$(PROJECT_TOOLS)/install-if-change
    3435INSTALL_VARIANT=$(PROJECT_TOOLS)/install-if-change -V "$(LIB_VARIANT)"
    35 
    36 FGREP=@FGREP@
    37 GREP=@GREP@
    38 EGREP=@EGREP@
    3936
    4037# FIXME: HACK for a bug in cygwin-hosted egcs which returns a mixture
    … …  
    7168        $(CHMOD) 0555 $@
    7269endef
     70
     71INSTBINFLAGS  = -m 0755
     72INSTDATAFLAGS = -m 0644
     73INSTLIBFLAGS  = -m 0644
     74INSTDIRFLAGS  = -m 0755 -d
     75INSTINCFLAGS  = -m 0644

  • make/main.cfg

    r8123c635 rf95d2b53  
    6464#
    6565
    66 RECURSE_TARGETS=all clean protos get clobber depend \
     66RECURSE_TARGETS=all clean protos get clobber depend install \
    6767                $(TARGET_VARIANTS) $(TARGET_VARIANTS:%=%_install)
    6868

  • tools/build/os/msdos/Makefile.in

    r8123c635 rf95d2b53  
    1919
    2020all:    $(DESTDIR) $(PGMS) install
    21         echo $(DESTDIR)
    2221
    2322$(DESTDIR):
    24         [ -d $@ ] || $(MKDIR) $@
     23        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    2524
    2625install:  $(INSTALLED)

  • tools/build/scripts/Makefile.in

    r8123c635 rf95d2b53  
    2424
    2525all:    $(DESTDIR) $(PGMS) install
    26         echo $(DESTDIR)
    2726
    2827$(DESTDIR):
    29         [ -d $@ ] || $(MKDIR) $@
     28        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    3029
    3130install:  $(INSTALLED)

  • tools/build/src/Makefile.in

    r8123c635 rf95d2b53  
    3333OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
    3434
     35# FIXME: building into $(ARCH) doesn't make sense for host programs
    3536PGMS=$(ARCH)/cklength$(EXEEXT) $(ARCH)/eolstrip$(EXEEXT) \
    3637        $(ARCH)/packhex$(EXEEXT) $(ARCH)/unhex$(EXEEXT)
    … …  
    6162CLOBBER_ADDITIONS +=
    6263
    63 all:    $(ARCH) $(SRCS) $(PGMS)
    64         $(INSTALL) -m 555 $(PGMS) ${PROJECT_RELEASE}/build-tools
     64DESTDIR=${PROJECT_RELEASE}/build-tools
     65
     66$(DESTDIR):
     67        $(BSDINSTALL) $(INSTDIRFLAGS) $@
     68
     69all:    $(ARCH) $(DESTDIR) $(SRCS) $(PGMS)
     70        $(BSDINSTALL) $(INSTBINFLAGS) $(PGMS) $(DESTDIR)

  • tools/cpu/generic/Makefile.in

    r8123c635 rf95d2b53  
    2323
    2424all:    $(DESTDIR) $(PGMS) install
    25         echo $(DESTDIR)
    2625
    2726$(DESTDIR):
    28         [ -d $@ ] || $(MKDIR) $@
     27        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    2928
    3029install:  $(INSTALLED)
    … …  
    3231# Install the program
    3332$(DESTDIR)/%: %
    34         $(make-script)
     33        $(BSDINSTALL) $(INSTBINFLAGS) $^ $@

  • tools/cpu/unix/Makefile.in

    r8123c635 rf95d2b53  
    5151
    5252all:    ${ARCH} $(SRCS) $(PGMS)
    53         $(INSTALL) -m 555 ${PGMS} ${PROJECT_RELEASE}/bin
     53        $(BSDINSTALL) $(INSTBINFLAGS) ${PGMS} ${PROJECT_RELEASE}/bin
    5454
    5555preinstall:

  • tools/update/Makefile.in

    r8123c635 rf95d2b53  
    2525
    2626all:  $(DESTDIR)
    27         echo $(DESTDIR)
    2827
    2928$(DESTDIR):
    30         [ -d $@ ] || $(MKDIR) $@
     29        $(BSDINSTALL) $(INSTDIRFLAGS) $@
    3130
    3231install:  $(INSTALLED)
    3332
    3433# Install the program
     34# FIXME: This isn't correct
    3535$(DESTDIR)/%: %
    3636        $(make-script)
    37         $(INSTALL)  -m 555 $(PERL_PGMS) ${DESTDIR}
    38         $(INSTALL)  -m 444 $(srcdir)/$(MISC_SUPPORT) ${DESTDIR}
     37        $(BSDINSTALL)  $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR}
     38        $(BSDINSTALL)  $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR}
Note: See TracChangeset for help on using the changeset viewer.