From dfc278c86836af40c395f2d332e7f681d5940758 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 25 Dec 2000 05:43:43 +0000 Subject: [PATCH] Fix problem remaking symbolic links. --- v7/src/edwin/Makefile.in | 18 ++++++++++-------- v7/src/runtime/Makefile.in | 16 +++++++++------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/v7/src/edwin/Makefile.in b/v7/src/edwin/Makefile.in index 59c77275b..dc70ed031 100644 --- a/v7/src/edwin/Makefile.in +++ b/v7/src/edwin/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.2 2000/12/25 05:35:49 cph Exp $ +# $Id: Makefile.in,v 1.3 2000/12/25 05:43:43 cph Exp $ # # Copyright (c) 2000 Massachusetts Institute of Technology # @@ -78,16 +78,18 @@ tags TAGS: install: $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/edwin $(mkinstalldirs) $(DESTDIR)$(EDDIR) - $(mkinstalldirs) $(DESTDIR)$(EODIR) $(INSTALL_DATA) *.bci $(DESTDIR)$(AUXDIR)/SRC/edwin/. - @for FN in $(EDOPTS); do \ - echo "$(INSTALL_DATA) $${FN}.com $(DESTDIR)$(EODIR)/.";\ - $(INSTALL_DATA) $${FN}.com $(DESTDIR)$(EODIR)/.;\ + -rm -rf $(DESTDIR)$(EODIR) + $(mkinstalldirs) $(DESTDIR)$(EODIR) + @for F in $(EDOPTS); do \ + echo "$(INSTALL_DATA) $${F}.com $(DESTDIR)$(EODIR)/.";\ + $(INSTALL_DATA) $${F}.com $(DESTDIR)$(EODIR)/.;\ done - @for FN in $(EDOPTS); do \ - echo "( cd $(DESTDIR)$(EODIR); rm -f $${FN}.bci; $(LN_S) ../../SRC/edwin/$${FN}.bci . )";\ - ( cd $(DESTDIR)$(EODIR); rm -f $${FN}.bci; $(LN_S) ../../SRC/edwin/$${FN}.bci . );\ + @for F in $(EDOPTS); do \ + REL="../../SRC/edwin/$${F}.bci";\ + echo "( cd $(DESTDIR)$(EODIR); $(LN_S) $${REL} . )";\ + ( cd $(DESTDIR)$(EODIR); $(LN_S) $${REL} . );\ done .PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install diff --git a/v7/src/runtime/Makefile.in b/v7/src/runtime/Makefile.in index 2ce72025a..3eca68d19 100644 --- a/v7/src/runtime/Makefile.in +++ b/v7/src/runtime/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.2 2000/12/25 05:35:15 cph Exp $ +# $Id: Makefile.in,v 1.3 2000/12/25 05:43:32 cph Exp $ # # Copyright (c) 2000 Massachusetts Institute of Technology # @@ -78,14 +78,16 @@ install: $(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/runtime $(INSTALL_DATA) *.bci $(DESTDIR)$(AUXDIR)/SRC/runtime/. + -rm -rf $(DESTDIR)$(RODIR) $(mkinstalldirs) $(DESTDIR)$(RODIR) - @for FN in $(RUNOPTS); do \ - echo "$(INSTALL_DATA) $${FN}.com $(DESTDIR)$(RODIR)/.";\ - $(INSTALL_DATA) $${FN}.com $(DESTDIR)$(RODIR)/.;\ + @for F in $(RUNOPTS); do \ + echo "$(INSTALL_DATA) $${F}.com $(DESTDIR)$(RODIR)/.";\ + $(INSTALL_DATA) $${F}.com $(DESTDIR)$(RODIR)/.;\ done - @for FN in $(RUNOPTS); do \ - echo "( cd $(DESTDIR)$(RODIR); rm -f $${FN}.bci; $(LN_S) ../SRC/runtime/$${FN}.bci . )";\ - ( cd $(DESTDIR)$(RODIR); rm -f $${FN}.bci; $(LN_S) ../SRC/runtime/$${FN}.bci . );\ + @for F in $(RUNOPTS); do \ + REL="../SRC/runtime/$${F}.bci";\ + echo "( cd $(DESTDIR)$(RODIR); $(LN_S) $${REL} . )";\ + ( cd $(DESTDIR)$(RODIR); $(LN_S) $${REL} . );\ done .PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install -- 2.25.1