From 26fac605fb387ffffe8da7cfee66a1aa4758c15c Mon Sep 17 00:00:00 2001 From: "David D. Zuhn" Date: Fri, 20 Aug 1993 00:37:33 +0000 Subject: [PATCH] fix install.sh on DECstation; handle lack of c++ on h8[35]00 for libio --- configure.in | 6 +++--- install.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index e7ffeda5a0e..19f16f458d1 100644 --- a/configure.in +++ b/configure.in @@ -171,16 +171,16 @@ case "${target}" in alpha-dec-osf1) configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'` configdirs=`echo ${configdirs} | sed -e 's/gdb//;s/emacs//;s/fileutils//'` - configdirs=`echo ${configdirs} | sed -e 's/grep//;s/libg++//'` + configdirs=`echo ${configdirs} | sed -e 's/grep//;s/libg++//;s/libio//'` ;; h8300*-*-*) - configdirs=`echo ${configdirs} | sed -e 's/libg++//'` + configdirs=`echo ${configdirs} | sed -e 's/libg++//;s/libio//'` ## start-sanitize-chill configdirs=`echo ${configdirs} | sed -e 's/chillrt//'` ## end-sanitize-chill ;; h8500-*-*) - configdirs=`echo ${configdirs} | sed -e 's/libg++//'` + configdirs=`echo ${configdirs} | sed -e 's/libg++//;s/libio//'` ## start-sanitize-chill configdirs=`echo ${configdirs} | sed -e 's/chillrt//'` ## end-sanitize-chill diff --git a/install.sh b/install.sh index 6f4be1b22b2..182e240a302 100755 --- a/install.sh +++ b/install.sh @@ -191,10 +191,10 @@ trap "rm -f ${dsttmp}" 0 && # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. -if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi && -if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi && -if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi && -if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi && +if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true ; fi && +if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true ; fi && +if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true ; fi && +if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true ; fi && # Now rename the file to the real destination. -- 2.30.2