diff options
| author | Per Bothner <bothner@cygnus.com> | 1998-10-22 14:47:52 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-10-22 08:47:52 -0600 |
| commit | 298978c9331b7601a24eeb5d46a56ee88740c9c2 (patch) | |
| tree | 2f72428c7d2b27b3cdaa01627f7e84dde4984531 | |
| parent | 4ac2fccfc79a61b3280f72de74eacead661509e2 (diff) | |
| download | gcc-298978c9331b7601a24eeb5d46a56ee88740c9c2.zip gcc-298978c9331b7601a24eeb5d46a56ee88740c9c2.tar.gz gcc-298978c9331b7601a24eeb5d46a56ee88740c9c2.tar.bz2 | |
Makefile.in (distdir-cvs, [...]): Clean up so it works if "$(srcdir)" != ".".
* Makefile.in (distdir-cvs, distdir-start): Clean up so it
works if "$(srcdir)" != ".".
From-SVN: r23222
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 42 |
2 files changed, 27 insertions, 20 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8f71571..d6be33b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 22 15:46:23 1998 Per Bothner (bothner@cygnus.com) + + * Makefile.in (distdir-cvs, distdir-start): Clean up so it + works if "$(srcdir)" != ".". + Wed Oct 21 19:23:59 1998 Jim Wilson <wilson@cygnus.com> * expmed.c (store_bit_field): If need to add a SUBREG, then remove diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 682f55a..a346620 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2703,7 +2703,7 @@ tmp-gcc.xtar: distdir tar -chf tmp-gcc.xtar gcc-$(version) distdir-cvs: force - if [ -d $(srcdir)/CVS ]; then cvs -r update; fi + if [ -d $(srcdir)/CVS ]; then cd $(srcdir) && cvs -r update; fi # This target exists to do the initial work before the language specific # stuff gets done. @@ -2718,7 +2718,7 @@ distdir-start: doc $(srcdir)/INSTALL $(srcdir)/c-parse.y $(srcdir)/c-gperf.h \ awk '$$1 " " $$2 " " $$3 == "This directory contains" \ { $$6 = version; print $$0 } \ $$1 " " $$2 " " $$3 != "This directory contains"' \ - version=$(version) README > tmp.README + version=$(version) $(srcdir)/README > tmp.README mv tmp.README README -rm -rf gcc-$(version) tmp # Put all the files in a temporary subdirectory @@ -2726,31 +2726,33 @@ distdir-start: doc $(srcdir)/INSTALL $(srcdir)/c-parse.y $(srcdir)/c-gperf.h \ mkdir tmp mkdir tmp/config mkdir tmp/ginclude - for file in *[0-9a-zA-Z+]; do \ - $(LN) $$file tmp; \ + mkdir tmp/objc + for file in `(cd $(srcdir) && echo *[0-9a-zA-Z+])`; do \ + test -f $(srcdir)/$$file && $(LN_S) $(srcdir)/$$file tmp; \ done - cd config; \ - for file in *[0-9a-zA-Z+]; do \ - if test -d $$file && test "$$file" != RCS && test "$$file" != CVS; then \ - mkdir ../tmp/config/$$file; \ - cd $$file; \ - for subfile in *[0-9a-zA-Z+]; do \ - $(LN) $$subfile ../../tmp/config/$$file; \ + if test "$(srcdir)" != "." ; then \ + for file in c-parse.c cexp.c ; do \ + test -f ./$$file && $(LN_S) ../$$file tmp; \ + done; \ + fi + for file in `(cd $(srcdir)/config && echo *[0-9a-zA-Z+])`; do \ + if test -d $(srcdir)/config/$$file \ + && test "$$file" != RCS && test "$$file" != CVS; then \ + mkdir tmp/config/$$file; \ + for subfile in `(cd $(srcdir)/config/$$file && echo *[0-9a-zA-Z+])`; do \ + $(LN_S) $(srcdir)/config/$$file/$$subfile tmp/config/$$file; \ done; \ - cd ..; \ else \ - $(LN) $$file ../tmp/config; \ + $(LN_S) $(srcdir)/config/$$file tmp/config; \ fi; \ done - cd ginclude; \ - for file in *[0-9a-zA-Z+]; do \ - $(LN) $$file ../tmp/ginclude; \ + for file in `(cd $(srcdir)/ginclude && echo *[0-9a-zA-Z+])`; do \ + $(LN_S) $(srcdir)/ginclude/$$file tmp/ginclude; \ done - cd objc; \ - for file in *[0-9a-zA-Z+]; do \ - $(LN) $$file ../tmp/objc; \ + for file in `(cd $(srcdir)/objc && echo *[0-9a-zA-Z+])`; do \ + $(LN_S) $(srcdir)/objc/$$file tmp/objc; \ done - $(LN) .gdbinit tmp + $(LN_S) .gdbinit tmp # Finish making `distdir', after the languages have done their thing. distdir-finish: |