Make tests work again on alpha-osf1 and sun4 native.

[binutils.git] / binutils / mpw-make.in

diff --git a/binutils/mpw-make.in b/binutils/mpw-make.in
index 24bc9f0fcb28d0a5651227a7d5c1a42989a47860..8e53997ffbccde88caf6ac79b6b80751d76863d9 100644 (file)
--- a/binutils/mpw-make.in
+++ b/binutils/mpw-make.in
@@ -37,7 +37,7 @@ prefix = :usr:local
 
 program_transform_name =
 exec_prefix = {prefix}
-bindir = {exec_prefix}:bin
+bindir = {exec_prefix}bin:
 libdir = {exec_prefix}:lib
 tooldir = {exec_prefix}:{target_alias}
 
@@ -93,7 +93,7 @@ DIST_NAME=binutils-{VERSION}
 # Where to find texinfo.tex to format docn with TeX
 TEXIDIR = "{srcdir}":texinfo
 
-MANPAGES= ar nm objdump ranlib size strings strip c++filt objcopy nlmconv
+MANPAGES= ar nm objdump ranlib size strings strip cplusfilt objcopy nlmconv
 
 #CC=gcc -Wall
 # these two are almost the same program
@@ -112,7 +112,7 @@ NM_PROG=nm
 OBJDUMP_PROG=objdump
 
 # This is the demangler, as a standalone program.
-DEMANGLER_PROG=c++filt
+DEMANGLER_PROG=cplusfilt
 
 NLMCONV_PROG=nlmconv
 
@@ -124,7 +124,7 @@ DISTSTUFF=arparse.c :arlex.c "{s}"nlmheader.c info
 BASEDIR = "{srcroot}"
 BFDDIR = {BASEDIR}bfd
 INCDIR = {BASEDIR}include
-INCLUDES = -i "{srcroot}"extra-include -i : -i {srcdir} -i ::bfd: -i {BFDDIR} -i {INCDIR}
+INCLUDES = -i "{INCDIR}":mpw: -i ::extra-include: -i : -i {srcdir} -i ::bfd: -i {BFDDIR} -i {INCDIR}
 
 #### host and target dependant Makefile fragments come in here.
 ###
@@ -459,20 +459,17 @@ TAGS \Option-f  force
        etags {INCDIR}:\Option-x.h "{srcdir}"\Option-x.[hc] 
 
 install \Option-f  all
-       for i in {PROGS} ; do \Option-d
-         {INSTALL_XFORM} $$i {bindir}:$$i ; \Option-d
-       done
-       for i in {MANPAGES} ; do \Option-d
-         {INSTALL_XFORM1} "{srcdir}"$$i.1 {man1dir}:$$i.1 ; \Option-d
-       done
-       if [ -d {tooldir} ]; then \Option-d
-          if [ -d {tooldir}:bin ] ; then true ; else mkdir {tooldir}:bin ; fi; \Option-d
-          for i in nm strip ar ranlib; do \Option-d
-            Delete -y {tooldir}:bin:$$i; \Option-d
-            # ln {bindir}:`t='{program_transform_name}'; echo $$i | sed -e "" $$t` {tooldir}:bin:$$i \Option-d
-             || {INSTALL_PROGRAM} $$i {tooldir}:bin:$$i; \Option-d
-          done; \Option-d
-        else true; fi          
+       If "`Exists "{prefix}"`" == ""
+               Echo "{prefix}" does not exist, cannot install anything
+               Exit 1
+       End If
+       If "`Exists "{bindir}"`" == ""
+               NewFolder "{bindir}"
+       End If
+       # Need to copy all the tools
+       For prog in {PROGS}
+               Duplicate -y :{prog} "{bindir}"{prog}
+       End For
 
 # Use binutils.info as the target so that VPATH will DTRT.
 # (Use "$<\Option-x" in case the output is multiple files, though.)