From 11cfb6f7f6326e79b4a930716c340b65d76d0683 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 14 Oct 1998 20:19:30 +0000
Subject: Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

   1. Rtems contains some perl scripts that use hard-coded paths to
      /usr/bin/perl or /usr/local/bin/perl I have already fixed these
      problems by adding some checks to configure.in.   While doing this,
      I also cleaned up some more autoconf related problems for generating
      shell scripts.  This patch might seem a bit scary to you, but I am
      quite confident it won't break something (I've been testing it for
      almost a week now, however it might introduce typos for a limited
      number configurations I don't have access to - But it shouldn't be
      a problem for you to test them :-).

   I expect to get this finished tonight, hence you will very likely
   have the patch when you get up tomorrow.

   Changes:

   * Check for PERL and disable all PERL scripts if perl wasn't found.
   * Generate all KSHELL-scripts with autoconf instead of make-script
   * Automatic dependency handling for autoconf generated KSHELL or PERL
     scripts (make/rtems.cfg)

   Notes:
   * this patch contains new files and deletes some other files.
   * The patch is relative to rtems-4.0.0-beta4 with my previous
     rtems-rc-981014-1.diff patch applied.

   Testing:
      I tested it with sh-rtems and posix under linux. Now all targets
      which are touched by this patch and which are not used while building
      for sh-rtems and posix still need to be tested. AFAIS, only the
      sparc/erc32 BSP should be affected by this criterion. And if you
      like to, you should also consider testing it on a Cygwin32 and a
      Solaris host for one arbitrary BSP.
---
 tools/update/Makefile.in | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'tools/update/Makefile.in')

diff --git a/tools/update/Makefile.in b/tools/update/Makefile.in
index 142bece1f1..45e3e63515 100644
--- a/tools/update/Makefile.in
+++ b/tools/update/Makefile.in
@@ -1,9 +1,6 @@
 #
 # $Id$
 #
-# NOTE: of course we can't use any of these tools
-#   in this Makefile.  Most notably: install-if-change
-#
 
 @SET_MAKE@
 srcdir = @srcdir@
@@ -13,26 +10,34 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
+include $(RTEMS_ROOT)/make/rtems.cfg
 
 DESTDIR=$(PROJECT_RELEASE)/update-tools
 
-PGMS=update word-replace
-MISC_SUPPORT=310_to_320_list
+BUILD_PGMS = update
+ifneq (@PERL@,)
+BUILD_PGMS += word-replace
+endif
 
-INSTALL_LIST= $(PGMS) $(MISC_SUPPORT)
+PGMS = $(BUILD_PGMS)
 
-INSTALLED=$(INSTALL_LIST:%=$(DESTDIR)/%)
+CLEAN_ADDITIONS += $(BUILD_PGMS)
+
+MISC_SUPPORT=310_to_320_list
 
-all:  $(DESTDIR)
+INSTALLED_PGMS=$(PGMS:%=$(DESTDIR)/%)
+INSTALLED_DATA=$(MISC_SUPPORT:%=$(DESTDIR)/%)
+
+all:  $(PGMS)
 
 $(DESTDIR):
 	@INSTALL@ $(INSTDIRFLAGS) $@
 
-install:  $(INSTALLED)
+$(INSTALLED_PGMS): $(PGMS)
+	@INSTALL@ $(INSTBINFLAGS) $^ $(DESTDIR)
+
+$(INSTALLED_DATA): $(MISC_SUPPORT)
+	@INSTALL@ $(INSTDATAFLAGS) $^ $(DESTDIR)
+
+install: $(DESTDIR) $(INSTALLED_PGMS) $(INSTALLED_DATA)
 
-# Install the program
-# FIXME: This isn't correct
-$(DESTDIR)/%: %
-	$(make-script)
-	@INSTALL@  $(INSTBINFLAGS) $(PERL_PGMS) ${DESTDIR}
-	@INSTALL@  $(INSTDATAFLAGS) $(MISC_SUPPORT) ${DESTDIR}
-- 
cgit v1.2.3