From: Jim Meyering Date: Fri, 12 Apr 2002 10:46:55 +0000 (+0000) Subject: . X-Git-Tag: SH-UTILS-2_0_12~184 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5771d0193b75cdb0d22c2c32278a711e2bfde5fd;p=platform%2Fupstream%2Fcoreutils.git . --- diff --git a/doc/Makefile.in b/doc/Makefile.in index 5e16820..4415650 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -257,8 +257,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/lib/Makefile.in b/lib/Makefile.in index ed5fa4e..237e657 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -537,7 +537,7 @@ distclean-depend: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -844,7 +844,7 @@ xstrtoul_.$(OBJEXT) xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : \ $(ANSI2KNR) .y.c: - $(YACCCOMPILE) `test -f $< || echo '$(srcdir)/'`$< + $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@ rm -f y.tab.c if test -f y.tab.h; then \ @@ -915,8 +915,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 771c010..53167ad 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -233,8 +233,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/chgrp/Makefile.in b/tests/chgrp/Makefile.in index fcda3a5..3c449ac 100644 --- a/tests/chgrp/Makefile.in +++ b/tests/chgrp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -213,8 +213,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/chmod/Makefile.in b/tests/chmod/Makefile.in index 466816b..134d7db 100644 --- a/tests/chmod/Makefile.in +++ b/tests/chmod/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -213,8 +213,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/chown/Makefile.in b/tests/chown/Makefile.in index ff493c9..719357e 100644 --- a/tests/chown/Makefile.in +++ b/tests/chown/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -213,8 +213,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/cp/Makefile.in b/tests/cp/Makefile.in index d479f83..43fa18f 100644 --- a/tests/cp/Makefile.in +++ b/tests/cp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -220,8 +220,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/dd/Makefile.in b/tests/dd/Makefile.in index db3913e..acf12c8 100644 --- a/tests/dd/Makefile.in +++ b/tests/dd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -218,8 +218,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/dircolors/Makefile.in b/tests/dircolors/Makefile.in index 27415ca..ed036bb 100644 --- a/tests/dircolors/Makefile.in +++ b/tests/dircolors/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -218,8 +218,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in index 762c312..ef7d302 100644 --- a/tests/du/Makefile.in +++ b/tests/du/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -213,8 +213,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in index 23fd7b9..790b887 100644 --- a/tests/install/Makefile.in +++ b/tests/install/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -213,8 +213,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/ln/Makefile.in b/tests/ln/Makefile.in index b3d4cb0..1a7d0ad 100644 --- a/tests/ln/Makefile.in +++ b/tests/ln/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -213,8 +213,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/ls-2/Makefile.in b/tests/ls-2/Makefile.in index d066d7c..86ed21c 100644 --- a/tests/ls-2/Makefile.in +++ b/tests/ls-2/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -218,8 +218,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in index ea52798..742ef46 100644 --- a/tests/ls/Makefile.in +++ b/tests/ls/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -218,8 +218,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in index 3a13f9b..3cea305 100644 --- a/tests/mkdir/Makefile.in +++ b/tests/mkdir/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -214,8 +214,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in index 429af2e..0b7bab6 100644 --- a/tests/mv/Makefile.in +++ b/tests/mv/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -224,8 +224,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/rm/Makefile.in b/tests/rm/Makefile.in index 171f053..d3b4b29 100644 --- a/tests/rm/Makefile.in +++ b/tests/rm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -221,8 +221,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/rmdir/Makefile.in b/tests/rmdir/Makefile.in index b263c6c..af49481 100644 --- a/tests/rmdir/Makefile.in +++ b/tests/rmdir/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -217,8 +217,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/shred/Makefile.in b/tests/shred/Makefile.in index d6ed84b..7e25fad 100644 --- a/tests/shred/Makefile.in +++ b/tests/shred/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -217,8 +217,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ diff --git a/tests/touch/Makefile.in b/tests/touch/Makefile.in index bad357d..c46f5ed 100644 --- a/tests/touch/Makefile.in +++ b/tests/touch/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -214,8 +214,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \