[project @ 1999-10-04 14:03:47 by simonmar]

cleanup

diff --git a/ghc/utils/hscpp/Makefile b/ghc/utils/hscpp/Makefile
index d919186..6a85958 100644 (file)
--- a/ghc/utils/hscpp/Makefile
+++ b/ghc/utils/hscpp/Makefile
@@ -27,8 +27,6 @@ install ::
        @$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
 
 
-CLEAN_FILES += $(SCRIPT_PROG)
-
 include $(TOP)/mk/target.mk
 
 

diff --git a/ghc/utils/hstags/Makefile b/ghc/utils/hstags/Makefile
index 2553840..d92352f 100644 (file)
--- a/ghc/utils/hstags/Makefile
+++ b/ghc/utils/hstags/Makefile
@@ -17,7 +17,7 @@ SCRIPT_SUBST_VARS=\
  ProjectVersionInt
 
 ifneq "$(BIN_DIST)" "1"
-SCRIPT_SUBST_VARS += libdir TMPDIR
+SCRIPT_SUBST_VARS += libdir libexecdir TMPDIR
 endif
 
 #
@@ -58,8 +58,6 @@ install ::
        @$(RM) $(SCRIPT_PROG)
        @$(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
 
-
-CLEAN_FILES += $(SCRIPT_PROG)
 include $(TOP)/mk/target.mk
 
 

diff --git a/ghc/utils/mkdependHS/Makefile b/ghc/utils/mkdependHS/Makefile
index 6f8fe79..c2bb0d1 100644 (file)
--- a/ghc/utils/mkdependHS/Makefile
+++ b/ghc/utils/mkdependHS/Makefile
@@ -49,8 +49,6 @@ install ::
        $(RM) $(SCRIPT_PROG)
        $(MAKE) $(MFLAGS) INSTALLING=1 $(SCRIPT_PROG)
 
-CLEAN_FILES += $(SCRIPT_PROG) $(SCRIPT_LINK)
-
 include $(TOP)/mk/target.mk
 
 #

diff --git a/ghc/utils/stat2resid/Makefile b/ghc/utils/stat2resid/Makefile
index 929b870..07def9b 100644 (file)
--- a/ghc/utils/stat2resid/Makefile
+++ b/ghc/utils/stat2resid/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.9 1998/02/04 20:56:24 sof Exp $
+# $Id: Makefile,v 1.10 1999/10/04 14:03:50 simonmar Exp $
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
@@ -21,7 +21,6 @@ SCRIPT_SUBST_VARS=TMPDIR
 endif
 
 INTERP=perl
-CLEAN_FILES += $(SCRIPT_PROG)
 
 #
 # The stat2resid script is configured with a different

diff --git a/mk/paths.mk b/mk/paths.mk
index 5ced7ca..933a6cb 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -157,8 +157,8 @@ TAGS_C_SRCS=$(C_SRCS)
 #
 #
 MOSTLY_CLEAN_FILES     += $(HS_OBJS) $(C_OBJS)
-CLEAN_FILES            += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(PROG) \
-                         $(LIBRARY) $(HS_IFACES) $(HS_HCS) \
+CLEAN_FILES            += $(HS_PROG) $(C_PROG) $(SCRIPT_PROG) $(SCRIPT_LINK) 
+                         $(PROG) $(LIBRARY) $(HS_IFACES) $(HS_HCS) \
                          a.out
 
 MAINTAINER_CLEAN_FILES += .depend $(BOOT_SRCS)

diff --git a/mk/target.mk b/mk/target.mk
index 93469dc..4a98ebc 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -452,17 +452,17 @@ all :: $(SCRIPT_LINK)
 
 #
 # Don't want to overwrite $(SCRIPT_LINK)s that aren't symbolic
-# links. Testing for symbol links is problematic to do in
+# links. Testing for symbolic links is problematic to do in
 # a portable fashion using a /bin/sh test, so we simply rely
 # on perl.
 #
 $(SCRIPT_LINK) : $(SCRIPT_PROG)
        @if ( $(PERL) -e '$$fn="$(SCRIPT_LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
-          echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK)"; \
+          echo "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK)"; \
           $(RM) $(SCRIPT_LINK); \
           $(LN_S) $(SCRIPT_PROG) $(SCRIPT_LINK); \
         else \
-          echo "Creating a symbol link from $(SCRIPT_PROG) to $(SCRIPT_LINK) failed: \`$(SCRIPT_LINK)' already exists"; \
+          echo "Creating a symbolic link from $(SCRIPT_PROG) to $(SCRIPT_LINK) failed: \`$(SCRIPT_LINK)' already exists"; \
           echo "Perhaps remove \`$(SCRIPT_LINK)' manually?"; \
           exit 1; \
         fi;
@@ -538,89 +538,26 @@ endif
 ifneq "$(INSTALL_SCRIPTS)" ""
 install:: $(INSTALL_SCRIPTS)
        @$(INSTALL_DIR) $(bindir)
-ifeq "$(INTERP)" "perl"
-ifneq "$(BIN_DIST)" "1"
-       @for i in $(INSTALL_SCRIPTS); do \
-          $(RM) $$i.tmp; \
-          echo "#! $(PERL)" > $$i.tmp ; \
-          echo '$$'"bindir='$(bindir)';"                            >> $$i.tmp ; \
-          echo '$$'"libdir='$(libdir)';"                            >> $$i.tmp ; \
-          echo '$$'"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
-          echo '$$'"datadir='$(datadir)';"                          >> $$i.tmp ; \
-          cat  $$i                                                >> $$i.tmp ; \
-          echo $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(bindir)/$$i ;    \
-          $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(bindir)/$$i ; \
-          $(RM) $$i.tmp; \
-       done
-else
-       for i in $(INSTALL_SCRIPTS); do \
-               $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir)/$$i; \
-       done
-endif
-else
        for i in $(INSTALL_SCRIPTS); do \
                $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(bindir); \
        done
 endif
-endif
 
 ifneq "$(INSTALL_LIB_SCRIPTS)" ""
 install:: $(INSTALL_LIB_SCRIPTS)
        @$(INSTALL_DIR) $(libdir)
-ifeq "$(INTERP)" "perl"
-ifneq "$(BIN_DIST)" "1"
-       @for i in $(INSTALL_LIB_SCRIPTS); do \
-          $(RM) $$i.tmp; \
-          echo "#! $(PERL)" > $$i.tmp ; \
-          echo '$$'"bindir='$(bindir)';"                            >> $$i.tmp ; \
-          echo '$$'"libdir='$(libdir)';"                            >> $$i.tmp ; \
-          echo '$$'"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
-          echo '$$'"datadir='$(datadir)';"                          >> $$i.tmp ; \
-          cat  $$i                                                >> $$i.tmp ; \
-          echo $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir)/$$i ;    \
-          $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(libdir)/$$i ; \
-          $(RM) $$i.tmp; \
-       done
-else
-       for i in $(INSTALL_LIB_SCRIPTS); do \
-               $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir)/$$i ; \
-       done
-endif
-else
        for i in $(INSTALL_LIB_SCRIPTS); do \
                $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libdir); \
        done
 endif
-endif
 
 ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
 install:: $(INSTALL_LIBEXEC_SCRIPTS)
        @$(INSTALL_DIR) $(libexecdir)
-ifeq "$(INTERP)" "perl"
-ifneq "$(BIN_DIST)" "1"
-       @for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
-          $(RM) $$i.tmp; \
-          echo "#! $(PERL)" > $$i.tmp ; \
-          echo '$$'"bindir='$(bindir)';"                            >> $$i.tmp ; \
-          echo '$$'"libdir='$(libdir)';"                            >> $$i.tmp ; \
-          echo '$$'"libexecdir='$(libexecdir)';"                    >> $$i.tmp ; \
-          echo '$$'"datadir='$(datadir)';"                          >> $$i.tmp ; \
-          cat  $$i                                                >> $$i.tmp ; \
-          echo $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir) ;    \
-          $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i.tmp $(libexecdir)/$$i ; \
-          $(RM) $$i.tmp; \
-       done
-else
        for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
                $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \
        done
 endif
-else
-       for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
-               $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(libexecdir); \
-       done
-endif
-endif
 
 ifneq "$(INSTALL_LIBS)" ""
 install:: $(INSTALL_LIBS)
@@ -1075,7 +1012,6 @@ endif     # if way
 # its tracks should any of the sub-makes fail. By my reckoning, 
 #  "cmd || exit $?" should be equivalent to "cmd"
 
-ifeq "$(way)" ""
 ifneq "$(SUBDIRS)" ""
 
 all docs runtests boot TAGS clean veryclean maintainer-clean install info ::
@@ -1107,7 +1043,6 @@ dist ::
          if [ $$? -eq 0 ] ;  then true; else exit $$x_on_err; fi; \
        done
 endif
-endif
 
 # The default dist rule:
 #