2000-08-31 Manfred Hollstein <manfredh@redhat.com>

* Makefile.am (install-data-local): Use optional $(DESTDIR) where
        required, as documented in the gnu coding standards.
        * Makefile.in: Regenerate.
This commit is contained in:
Jeff Johnston 2000-09-05 18:39:58 +00:00
parent f825dfda78
commit a36cd013b9
3 changed files with 25 additions and 20 deletions

View File

@ -1,3 +1,9 @@
2000-09-05 Manfred Hollstein <manfredh@redhat.com>
* Makefile.am (install-data-local): Use optional $(DESTDIR) where
required, as documented in the gnu coding standards.
* Makefile.in: Regenerate.
2000-09-05 Jeff Johnston <jjohnstn@redhat.com> 2000-09-05 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/fcntl.h (_FNDELAY): Changed to be _FNONBLOCK to * libc/include/fcntl.h (_FNDELAY): Changed to be _FNONBLOCK to

View File

@ -129,32 +129,32 @@ stmp-targ-include: config.status
CLEANFILES = targ-include stmp-targ-include CLEANFILES = targ-include stmp-targ-include
install-data-local: install-toollibLIBRARIES install-data-local: install-toollibLIBRARIES
rm -f $(toollibdir)/libg.a rm -f $(DESTDIR)$(toollibdir)/libg.a
ln $(toollibdir)/libc.a $(toollibdir)/libg.a ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-if [ -z "$(MULTISUBDIR)" ]; then \ -if [ -z "$(MULTISUBDIR)" ]; then \
for i in $(srcdir)/libc/include/*.h; do \ for i in $(srcdir)/libc/include/*.h; do \
$(INSTALL_DATA) $$i $(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/include/machine/*.h; do \ for i in $(srcdir)/libc/include/machine/*.h; do \
$(INSTALL_DATA) $$i $(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done; \ done; \
for i in $(srcdir)/libc/include/sys/*.h; do \ for i in $(srcdir)/libc/include/sys/*.h; do \
$(INSTALL_DATA) $$i $(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
else true; fi else true; fi

View File

@ -126,8 +126,7 @@ AM_MAKEFLAGS = \
"DESTDIR=$(DESTDIR)" "DESTDIR=$(DESTDIR)"
@HAVE_DOC_TRUE@DOCDIR = \ @HAVE_DOC_TRUE@DOCDIR = @HAVE_DOC_TRUE@doc
@HAVE_DOC_TRUE@doc
SUBDIRS = libc libm $(DOCDIR) . SUBDIRS = libc libm $(DOCDIR) .
@ -185,7 +184,7 @@ acinclude.m4 aclocal.m4 configure configure.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar TAR = gtar
GZIP_ENV = --best GZIP_ENV = --best
DIST_SUBDIRS = libc libm doc . DIST_SUBDIRS = libc libm doc .
SOURCES = libm.a.c libc.a.c SOURCES = libm.a.c libc.a.c
@ -409,7 +408,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
if test -f $$file; then d=.; else d=$(srcdir); fi; \ if test -f $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \ if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \ cp -pr $$d/$$file $(distdir)/$$file; \
else \ else \
test -f $(distdir)/$$file \ test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@ -563,32 +562,32 @@ stmp-targ-include: config.status
touch $@ touch $@
install-data-local: install-toollibLIBRARIES install-data-local: install-toollibLIBRARIES
rm -f $(toollibdir)/libg.a rm -f $(DESTDIR)$(toollibdir)/libg.a
ln $(toollibdir)/libc.a $(toollibdir)/libg.a ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a
$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
-if [ -z "$(MULTISUBDIR)" ]; then \ -if [ -z "$(MULTISUBDIR)" ]; then \
for i in $(srcdir)/libc/include/*.h; do \ for i in $(srcdir)/libc/include/*.h; do \
$(INSTALL_DATA) $$i $(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/include/machine/*.h; do \ for i in $(srcdir)/libc/include/machine/*.h; do \
$(INSTALL_DATA) $$i $(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(tooldir)/include/machine/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/machine/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done; \ done; \
for i in $(srcdir)/libc/include/sys/*.h; do \ for i in $(srcdir)/libc/include/sys/*.h; do \
$(INSTALL_DATA) $$i $(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
done; \ done; \
for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/sys/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(tooldir)/include/sys/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/sys/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \ for i in $(srcdir)/libc/sys/$(sys_dir)/include/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
$(INSTALL_DATA) $$i $(tooldir)/include/`basename $$i`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done ; \ done ; \
else true; fi else true; fi