Changeset 549

Timestamp:

May 9, 2019, 10:43:55 PM (6 years ago)

Author:

katerina

Message:

Fix for ticket #440 (obsolete sstrip utility) and #441 (make deb broken).

Location:

trunk

Files:

• Makefile.in (modified) (13 diffs)
• config.guess (modified) (61 diffs)
• config.sub (modified) (64 diffs)
• docs/Changelog (modified) (1 diff)
• docs/README.sstrip (deleted)
• init/samhain.startSystemd.in (modified) (1 diff)
• rules.deb-light.in (modified) (2 diffs)
• rules.deb.in (modified) (2 diffs)
• src/sstrip.c (deleted)

trunk/Makefile.in

@@ -151 +151 @@
         $(srcsrc)/bignum.c $(srcsrc)/mkhdr.c \
         $(srcsrc)/samhain_setpwd.c $(srcsrc)/samhain_stealth.c \
-        $(srcsrc)/encode.c $(srcsrc)/sstrip.c \
+        $(srcsrc)/encode.c \
         $(srcsrc)/trustfile.c $(srcsrc)/exepack.c \
         $(srcsrc)/exepack_fill.c $(srcsrc)/exepack_mkdata.c \
@@ -232 +232 @@
 #----------------------------------------------------------
 
-all: $(top_srcdir)/depend.sum $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL) sstrip
+all: $(top_srcdir)/depend.sum $(SETPWD) $(STEGIN) $(SAMHAIN) $(YULECTL)
 
 
@@ -363 +363 @@
 
 CLEANFILES = encode config_xor.h depend-gen \
-        internal.h sh_MK.h trustfile sstrip samhain mkhdr encode cutest \
+        internal.h sh_MK.h trustfile samhain mkhdr encode cutest \
         yule samhain_setpwd samhain_stealth samhainrc yulectl
 
@@ -515 +515 @@
 
 
-install-program: $(PROGRAMS) sstrip
+install-program: $(PROGRAMS) 
         @$(mkinstalldirs) $(DESTDIR)$(sbindir)
         @if test x$(mytmpdir) != x; then \
@@ -528 +528 @@
               $(INSTALL_PROGRAM) $$p $$target; \
               chmod 0700 $$target; \
-              echo " ./sstrip $$target"; \
-              ./sstrip $$target; \
             else \
               echo " $(INSTALL_SHELL) $$p $$target"; \
@@ -840 +838 @@
         echo $(top_srcdir)/docs/README.gcc_bug           >> debian/docs; \
         echo $(top_srcdir)/docs/README.LZO               >> debian/docs; \
-        echo $(top_srcdir)/docs/README.sstrip            >> debian/docs; \
         echo $(top_srcdir)/docs/README.UPGRADE           >> debian/docs; \
         echo $(top_srcdir)/docs/README.win2K             >> debian/docs; \
@@ -860 +857 @@
         echo " -- $$maintainer  `date -R`" >> debian/changelog; \
         echo >> debian/changelog; \
-        echo "Local variables:" >> debian/changelog; \
-        echo "mode: debian-changelog" >> debian/changelog; \
-        echo "End:" >> debian/changelog; \
         cp   $(top_srcdir)/COPYING  debian/copyright; \
         echo "9" > debian/compat; \
@@ -890 +884 @@
         echo "Priority: optional" >> debian/control; \
         echo "Maintainer: $$maintainer" >> debian/control; \
-        echo "Standards-Version: 3.2.1" >> debian/control; \
+        echo "Build-Depends: debhelper (>> 9)" >> debian/control; \
+        echo "Standards-Version: 3.9.8" >> debian/control; \
         echo >> debian/control; \
         echo "Package: @install_name@" >> debian/control; \
@@ -1130 +1125 @@
 
 
-sstrip: $(srcsrc)/sstrip.c Makefile
-        $(BUILD_CC) -I.  -o sstrip $(srcsrc)/sstrip.c
-
 encode: $(srcsrc)/encode.c Makefile
         $(BUILD_CC) -I. -o encode $(srcsrc)/encode.c
@@ -1259 +1251 @@
 # prepare the data to be packed
 #
-exepack.data: $(SAMHAIN) exepack_mkdata sstrip
+exepack.data: $(SAMHAIN) exepack_mkdata 
         @echo "cp ./$(SAMHAIN) ./samhain.pk.data"; \
         cp ./$(SAMHAIN) ./samhain.pk.data; \
         echo "strip ./samhain.pk.data"; \
         strip ./samhain.pk.data > /dev/null 2>&1  || echo "... is already stripped"; \
-        echo "./sstrip ./samhain.pk.data"; \
-        ./sstrip ./samhain.pk.data > /dev/null 2>&1  || echo "sstrip returned false"; \
         echo "./exepack_mkdata ./samhain.pk.data ./exepack.data 0"; \
         ./exepack_mkdata ./samhain.pk.data ./exepack.data 0; \
@@ -1286 +1276 @@
         $(LINK) exepack_fill.o minilzo.o
 
-samhain.pk: $(SAMHAIN) exepack exepack_fill sstrip
+samhain.pk: $(SAMHAIN) exepack exepack_fill 
         @echo "cp ./$(SAMHAIN) ./samhain.pk.data"; \
         cp ./$(SAMHAIN) ./samhain.pk.data; \
         echo "strip ./samhain.pk.data"; \
         strip ./samhain.pk.data > /dev/null 2>&1  || echo "... is already stripped"; \
-        echo "./sstrip ./samhain.pk.data"; \
-        ./sstrip ./samhain.pk.data > /dev/null 2>&1  || echo "sstrip returned false"; \
         test -f exepack.out && rm exepack.out; \
         echo "./exepack_fill exepack samhain.pk.data exepack.out"; \
@@ -1299 +1287 @@
         echo "strip exepack.out"; \
         strip exepack.out > /dev/null 2>&1 || echo "... is already stripped"; \
-        ./sstrip exepack.out > /dev/null 2>&1 || echo "sstrip returned false"; \
         echo "mv exepack.out samhain.pk"; \
         rm -f samhain.pk; mv exepack.out samhain.pk
@@ -1673 +1660 @@
 samhain_stealth.o: $(srcsrc)/samhain_stealth.c Makefile config_xor.h 
 encode.o: $(srcsrc)/encode.c Makefile 
-sstrip.o: $(srcsrc)/sstrip.c Makefile config.h 
 trustfile.o: $(srcsrc)/trustfile.c Makefile config_xor.h $(srcinc)/sh_calls.h $(srcinc)/slib.h $(srcinc)/sh_static.h $(srcinc)/sh_pthread.h 
 exepack.o: $(srcsrc)/exepack.c Makefile config.h $(srcinc)/minilzo.h $(srcinc)/exepack.data 

trunk/config.guess

@@ -1 +1 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-03-23'
+#   Copyright 1992-2018 Free Software Foundation, Inc.
+
+timestamp='2018-02-24'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -16 +16 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
@@ -25 +25 @@
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
@@ -40 +40 @@
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
@@ -51 +51 @@
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -108 +108 @@
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
+ ,,)    echo "int x;" > "$dummy.c" ;
         for c in cc gcc c89 c99 ; do
-          if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+          if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
              CC_FOR_BUILD="$c"; break ;
           fi ;
@@ -133 +133 @@
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
 Linux|GNU|GNU/*)
         # If the system lacks a compiler, then just pick glibc.
@@ -139 +139 @@
         LIBC=gnu
 
-        eval $set_cc_for_build
-        cat <<-EOF > $dummy.c
+        eval "$set_cc_for_build"
+        cat <<-EOF > "$dummy.c"
         #include <features.h>
         #if defined(__UCLIBC__)
@@ -150 +150 @@
         #endif
         EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+        # If ldd exists, use it to detect musl libc.
+        if command -v ldd >/dev/null && \
+                ldd --version 2>&1 | grep -q ^musl
+        then
+            LIBC=musl
+        fi
         ;;
 esac
@@ -156 +163 @@
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:NetBSD:*:*)
         # NetBSD (nbsd) targets should (where applicable) match one or
@@ -169 +176 @@
         # portion of the name.  We always set it to "unknown".
         sysctl="sysctl -n hw.machine_arch"
-        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-        case "${UNAME_MACHINE_ARCH}" in
+        UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+            "/sbin/$sysctl" 2>/dev/null || \
+            "/usr/sbin/$sysctl" 2>/dev/null || \
+            echo unknown)`
+        case "$UNAME_MACHINE_ARCH" in
             armeb) machine=armeb-unknown ;;
             arm*) machine=arm-unknown ;;
@@ -177 +186 @@
             sh3eb) machine=sh-unknown ;;
             sh5el) machine=sh5le-unknown ;;
-            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+            earmv*)
+                arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+                endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+                machine="${arch}${endian}"-unknown
+                ;;
+            *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
         esac
         # The Operating System including object format, if it has switched
-        # to ELF recently, or will in the future.
-        case "${UNAME_MACHINE_ARCH}" in
+        # to ELF recently (or will in the future) and ABI.
+        case "$UNAME_MACHINE_ARCH" in
+            earm*)
+                os=netbsdelf
+                ;;
             arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-                eval $set_cc_for_build
+                eval "$set_cc_for_build"
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                         | grep -q __ELF__
@@ -198 +215 @@
                 ;;
         esac
+        # Determine ABI tags.
+        case "$UNAME_MACHINE_ARCH" in
+            earm*)
+                expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+                abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+                ;;
+        esac
         # The OS release
         # Debian GNU/NetBSD machines have a different userland, and
@@ -203 +227 @@
         # kernel version information, so it can be replaced with a
         # suitable tag, in the style of linux-gnu.
-        case "${UNAME_VERSION}" in
+        case "$UNAME_VERSION" in
             Debian*)
                 release='-gnu'
                 ;;
             *)
-                release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+                release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
                 ;;
         esac
@@ -214 +238 @@
         # contains redundant information, the shorter form:
         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-        echo "${machine}-${os}${release}"
+        echo "$machine-${os}${release}${abi}"
         exit ;;
     *:Bitrig:*:*)
         UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-        echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+        echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
         exit ;;
     *:OpenBSD:*:*)
         UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+        echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
+        exit ;;
+    *:LibertyBSD:*:*)
+        UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+        echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
+        exit ;;
+    *:MidnightBSD:*:*)
+        echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
         exit ;;
     *:ekkoBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+        echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
         exit ;;
     *:SolidBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
         exit ;;
     macppc:MirBSD:*:*)
-        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+        echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
         exit ;;
     *:MirBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-        exit ;;
+        echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
+        exit ;;
+    *:Sortix:*:*)
+        echo "$UNAME_MACHINE"-unknown-sortix
+        exit ;;
+    *:Redox:*:*)
+        echo "$UNAME_MACHINE"-unknown-redox
+        exit ;;
+    mips:OSF1:*.*)
+        echo mips-dec-osf1
+        exit ;;
     alpha:OSF1:*:*)
         case $UNAME_RELEASE in
@@ -252 +292 @@
         case "$ALPHA_CPU_TYPE" in
             "EV4 (21064)")
-                UNAME_MACHINE="alpha" ;;
+                UNAME_MACHINE=alpha ;;
             "EV4.5 (21064)")
-                UNAME_MACHINE="alpha" ;;
+                UNAME_MACHINE=alpha ;;
             "LCA4 (21066/21068)")
-                UNAME_MACHINE="alpha" ;;
+                UNAME_MACHINE=alpha ;;
             "EV5 (21164)")
-                UNAME_MACHINE="alphaev5" ;;
+                UNAME_MACHINE=alphaev5 ;;
             "EV5.6 (21164A)")
-                UNAME_MACHINE="alphaev56" ;;
+                UNAME_MACHINE=alphaev56 ;;
             "EV5.6 (21164PC)")
-                UNAME_MACHINE="alphapca56" ;;
+                UNAME_MACHINE=alphapca56 ;;
             "EV5.7 (21164PC)")
-                UNAME_MACHINE="alphapca57" ;;
+                UNAME_MACHINE=alphapca57 ;;
             "EV6 (21264)")
-                UNAME_MACHINE="alphaev6" ;;
+                UNAME_MACHINE=alphaev6 ;;
             "EV6.7 (21264A)")
-                UNAME_MACHINE="alphaev67" ;;
+                UNAME_MACHINE=alphaev67 ;;
             "EV6.8CB (21264C)")
-                UNAME_MACHINE="alphaev68" ;;
+                UNAME_MACHINE=alphaev68 ;;
             "EV6.8AL (21264B)")
-                UNAME_MACHINE="alphaev68" ;;
+                UNAME_MACHINE=alphaev68 ;;
             "EV6.8CX (21264D)")
-                UNAME_MACHINE="alphaev68" ;;
+                UNAME_MACHINE=alphaev68 ;;
             "EV6.9A (21264/EV69A)")
-                UNAME_MACHINE="alphaev69" ;;
+                UNAME_MACHINE=alphaev69 ;;
             "EV7 (21364)")
-                UNAME_MACHINE="alphaev7" ;;
+                UNAME_MACHINE=alphaev7 ;;
             "EV7.9 (21364A)")
-                UNAME_MACHINE="alphaev79" ;;
+                UNAME_MACHINE=alphaev79 ;;
         esac
         # A Pn.n version is a patched version.
@@ -287 +327 @@
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
-        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
         # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
         exitcode=$?
         trap '' 0
         exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-        # How do we know it's Interix rather than the generic POSIX subsystem?
-        # Should we change UNAME_MACHINE based on the output of uname instead
-        # of the specific Alpha model?
-        echo alpha-pc-interix
-        exit ;;
-    21064:Windows_NT:50:3)
-        echo alpha-dec-winnt3.5
-        exit ;;
     Amiga*:UNIX_System_V:4.0:*)
         echo m68k-unknown-sysv4
         exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
-        echo ${UNAME_MACHINE}-unknown-amigaos
+        echo "$UNAME_MACHINE"-unknown-amigaos
         exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
-        echo ${UNAME_MACHINE}-unknown-morphos
+        echo "$UNAME_MACHINE"-unknown-morphos
         exit ;;
     *:OS/390:*:*)
@@ -320 +351 @@
         exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-        echo arm-acorn-riscix${UNAME_RELEASE}
+        echo arm-acorn-riscix"$UNAME_RELEASE"
         exit ;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
@@ -347 +378 @@
         esac ;;
     s390x:SunOS:*:*)
-        echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
         exit ;;
     sun4H:SunOS:5.*:*)
-        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
         exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`"
         exit ;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-        echo i386-pc-auroraux${UNAME_RELEASE}
+        echo i386-pc-auroraux"$UNAME_RELEASE"
         exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-        eval $set_cc_for_build
-        SUN_ARCH="i386"
+        eval "$set_cc_for_build"
+        SUN_ARCH=i386
         # If there is a compiler, see if it is configured for 64-bit objects.
         # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
         # This test works for both compilers.
-        if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+        if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
             if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-                (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
                 grep IS_64BIT_ARCH >/dev/null
             then
-                SUN_ARCH="x86_64"
+                SUN_ARCH=x86_64
             fi
         fi
-        echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
         exit ;;
     sun4*:SunOS:6*:*)
@@ -378 +409 @@
         # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
         # it's likely to be more like Solaris than SunOS4.
-        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
         exit ;;
     sun4*:SunOS:*:*)
@@ -387 +418 @@
         esac
         # Japanese Language versions have a version number like `4.1.3-JL'.
-        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+        echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`"
         exit ;;
     sun3*:SunOS:*:*)
-        echo m68k-sun-sunos${UNAME_RELEASE}
+        echo m68k-sun-sunos"$UNAME_RELEASE"
         exit ;;
     sun*:*:4.2BSD:*)
         UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+        test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
         case "`/bin/arch`" in
             sun3)
-                echo m68k-sun-sunos${UNAME_RELEASE}
+                echo m68k-sun-sunos"$UNAME_RELEASE"
                 ;;
             sun4)
-                echo sparc-sun-sunos${UNAME_RELEASE}
+                echo sparc-sun-sunos"$UNAME_RELEASE"
                 ;;
         esac
         exit ;;
     aushp:SunOS:*:*)
-        echo sparc-auspex-sunos${UNAME_RELEASE}
+        echo sparc-auspex-sunos"$UNAME_RELEASE"
         exit ;;
     # The situation for MiNT is a little confusing.  The machine name
@@ -416 +447 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint"$UNAME_RELEASE"
         exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint"$UNAME_RELEASE"
         exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint"$UNAME_RELEASE"
         exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
+        echo m68k-milan-mint"$UNAME_RELEASE"
         exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
+        echo m68k-hades-mint"$UNAME_RELEASE"
         exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
+        echo m68k-unknown-mint"$UNAME_RELEASE"
         exit ;;
     m68k:machten:*:*)
-        echo m68k-apple-machten${UNAME_RELEASE}
+        echo m68k-apple-machten"$UNAME_RELEASE"
         exit ;;
     powerpc:machten:*:*)
-        echo powerpc-apple-machten${UNAME_RELEASE}
+        echo powerpc-apple-machten"$UNAME_RELEASE"
         exit ;;
     RISC*:Mach:*:*)
@@ -443 +474 @@
         exit ;;
     RISC*:ULTRIX:*:*)
-        echo mips-dec-ultrix${UNAME_RELEASE}
+        echo mips-dec-ultrix"$UNAME_RELEASE"
         exit ;;
     VAX*:ULTRIX*:*:*)
-        echo vax-dec-ultrix${UNAME_RELEASE}
+        echo vax-dec-ultrix"$UNAME_RELEASE"
         exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-        echo clipper-intergraph-clix${UNAME_RELEASE}
+        echo clipper-intergraph-clix"$UNAME_RELEASE"
         exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
+        eval "$set_cc_for_build"
+        sed 's/^        //' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -462 +493 @@
         #if defined (host_mips) && defined (MIPSEB)
         #if defined (SYSTYPE_SYSV)
-          printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+          printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
         #endif
         #if defined (SYSTYPE_SVR4)
-          printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+          printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
         #endif
         #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-          printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+          printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
         #endif
         #endif
@@ -474 +505 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c &&
-          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-          SYSTEM_NAME=`$dummy $dummyarg` &&
+        $CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+          dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+          SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
             { echo "$SYSTEM_NAME"; exit; }
-        echo mips-mips-riscos${UNAME_RELEASE}
+        echo mips-mips-riscos"$UNAME_RELEASE"
         exit ;;
     Motorola:PowerMAX_OS:*:*)
@@ -504 +535 @@
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+        if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ]
         then
-            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-               [ ${TARGET_BINARY_INTERFACE}x = x ]
+            if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \
+               [ "$TARGET_BINARY_INTERFACE"x = x ]
             then
-                echo m88k-dg-dgux${UNAME_RELEASE}
+                echo m88k-dg-dgux"$UNAME_RELEASE"
             else
-                echo m88k-dg-dguxbcs${UNAME_RELEASE}
+                echo m88k-dg-dguxbcs"$UNAME_RELEASE"
             fi
         else
-            echo i586-dg-dgux${UNAME_RELEASE}
+            echo i586-dg-dgux"$UNAME_RELEASE"
         fi
         exit ;;
@@ -531 +562 @@
         exit ;;
     *:IRIX*:*:*)
-        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+        echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`"
         exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
@@ -543 +574 @@
                 IBM_REV=`/usr/bin/oslevel`
         else
-                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-        fi
-        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+        fi
+        echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV"
         exit ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                eval $set_cc_for_build
-                sed 's/^                //' << EOF >$dummy.c
+                eval "$set_cc_for_build"
+                sed 's/^                //' << EOF > "$dummy.c"
                 #include <sys/systemcfg.h>
 
@@ -561 +592 @@
                         }
 EOF
-                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+                if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
                 then
                         echo "$SYSTEM_NAME"
@@ -575 +606 @@
     *:AIX:*:[4567])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+        if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
                 IBM_ARCH=rs6000
         else
                 IBM_ARCH=powerpc
         fi
-        if [ -x /usr/bin/oslevel ] ; then
-                IBM_REV=`/usr/bin/oslevel`
+        if [ -x /usr/bin/lslpp ] ; then
+                IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+                           awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
         else
-                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-        fi
-        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+        fi
+        echo "$IBM_ARCH"-ibm-aix"$IBM_REV"
         exit ;;
     *:AIX:*:*)
         echo rs6000-ibm-aix
         exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
         echo romp-ibm-bsd4.4
         exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+        echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to
         exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -609 +641 @@
         exit ;;
     9000/[34678]??:HP-UX:*:*)
-        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-        case "${UNAME_MACHINE}" in
-            9000/31? )            HP_ARCH=m68000 ;;
-            9000/[34]?? )         HP_ARCH=m68k ;;
+        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+        case "$UNAME_MACHINE" in
+            9000/31?)            HP_ARCH=m68000 ;;
+            9000/[34]??)         HP_ARCH=m68k ;;
             9000/[678][0-9][0-9])
                 if [ -x /usr/bin/getconf ]; then
                     sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                    case "$sc_cpu_version" in
+                      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
                       532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        case "$sc_kernel_bits" in
+                          32) HP_ARCH=hppa2.0n ;;
+                          64) HP_ARCH=hppa2.0w ;;
+                          '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
                         esac ;;
                     esac
                 fi
-                if [ "${HP_ARCH}" = "" ]; then
-                    eval $set_cc_for_build
-                    sed 's/^            //' << EOF >$dummy.c
+                if [ "$HP_ARCH" = "" ]; then
+                    eval "$set_cc_for_build"
+                    sed 's/^            //' << EOF > "$dummy.c"
 
                 #define _HPUX_SOURCE
@@ -663 +695 @@
                 }
 EOF
-                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
                     test -z "$HP_ARCH" && HP_ARCH=hppa
                 fi ;;
         esac
-        if [ ${HP_ARCH} = "hppa2.0w" ]
+        if [ "$HP_ARCH" = hppa2.0w ]
         then
-            eval $set_cc_for_build
+            eval "$set_cc_for_build"
 
             # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
@@ -680 +712 @@
             # => hppa64-hp-hpux11.23
 
-            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+            if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
                 grep -q __LP64__
             then
-                HP_ARCH="hppa2.0w"
+                HP_ARCH=hppa2.0w
             else
-                HP_ARCH="hppa64"
+                HP_ARCH=hppa64
             fi
         fi
-        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+        echo "$HP_ARCH"-hp-hpux"$HPUX_REV"
         exit ;;
     ia64:HP-UX:*:*)
-        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-        echo ia64-hp-hpux${HPUX_REV}
+        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'`
+        echo ia64-hp-hpux"$HPUX_REV"
         exit ;;
     3050*:HI-UX:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
+        eval "$set_cc_for_build"
+        sed 's/^        //' << EOF > "$dummy.c"
         #include <unistd.h>
         int
@@ -721 +753 @@
         }
 EOF
-        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+        $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
                 { echo "$SYSTEM_NAME"; exit; }
         echo unknown-hitachi-hiuxwe2
         exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
         echo hppa1.1-hp-bsd
         exit ;;
@@ -734 +766 @@
         echo hppa1.0-hp-mpeix
         exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
         echo hppa1.1-hp-osf
         exit ;;
@@ -742 +774 @@
     i*86:OSF1:*:*)
         if [ -x /usr/sbin/sysversion ] ; then
-            echo ${UNAME_MACHINE}-unknown-osf1mk
+            echo "$UNAME_MACHINE"-unknown-osf1mk
         else
-            echo ${UNAME_MACHINE}-unknown-osf1
+            echo "$UNAME_MACHINE"-unknown-osf1
         fi
         exit ;;
@@ -769 +801 @@
         exit ;;
     CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
         exit ;;
     CRAY*[A-Z]90:*:*:*)
-        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+        echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
         | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
@@ -778 +810 @@
         exit ;;
     CRAY*TS:*:*:*)
-        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
         exit ;;
     CRAY*T3E:*:*:*)
-        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
         exit ;;
     CRAY*SV1:*:*:*)
-        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
         exit ;;
     *:UNICOS/mp:*:*)
-        echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+        echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'
         exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+        FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+        FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+        echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE"
         exit ;;
     sparc*:BSD/OS:*:*)
-        echo sparc-unknown-bsdi${UNAME_RELEASE}
+        echo sparc-unknown-bsdi"$UNAME_RELEASE"
         exit ;;
     *:BSD/OS:*:*)
-        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+        echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
         exit ;;
     *:FreeBSD:*:*)
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        case ${UNAME_PROCESSOR} in
+        case "$UNAME_PROCESSOR" in
             amd64)
-                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-            *)
-                echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+                UNAME_PROCESSOR=x86_64 ;;
+            i386)
+                UNAME_PROCESSOR=i586 ;;
         esac
+        echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
         exit ;;
     i*:CYGWIN*:*)
-        echo ${UNAME_MACHINE}-pc-cygwin
+        echo "$UNAME_MACHINE"-pc-cygwin
         exit ;;
     *:MINGW64*:*)
-        echo ${UNAME_MACHINE}-pc-mingw64
+        echo "$UNAME_MACHINE"-pc-mingw64
         exit ;;
     *:MINGW*:*)
-        echo ${UNAME_MACHINE}-pc-mingw32
+        echo "$UNAME_MACHINE"-pc-mingw32
         exit ;;
     *:MSYS*:*)
-        echo ${UNAME_MACHINE}-pc-msys
-        exit ;;
-    i*:windows32*:*)
-        # uname -m includes "-pc" on this system.
-        echo ${UNAME_MACHINE}-mingw32
+        echo "$UNAME_MACHINE"-pc-msys
         exit ;;
     i*:PW*:*)
-        echo ${UNAME_MACHINE}-pc-pw32
+        echo "$UNAME_MACHINE"-pc-pw32
         exit ;;
     *:Interix*:*)
-        case ${UNAME_MACHINE} in
+        case "$UNAME_MACHINE" in
             x86)
-                echo i586-pc-interix${UNAME_RELEASE}
+                echo i586-pc-interix"$UNAME_RELEASE"
                 exit ;;
             authenticamd | genuineintel | EM64T)
-                echo x86_64-unknown-interix${UNAME_RELEASE}
+                echo x86_64-unknown-interix"$UNAME_RELEASE"
                 exit ;;
             IA64)
-                echo ia64-unknown-interix${UNAME_RELEASE}
+                echo ia64-unknown-interix"$UNAME_RELEASE"
                 exit ;;
         esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-        echo i${UNAME_MACHINE}-pc-mks
-        exit ;;
-    8664:Windows_NT:*)
-        echo x86_64-pc-mks
-        exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-        # How do we know it's Interix rather than the generic POSIX subsystem?
-        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-        # UNAME_MACHINE based on the output of uname instead of i386?
-        echo i586-pc-interix
-        exit ;;
     i*:UWIN*:*)
-        echo ${UNAME_MACHINE}-pc-uwin
+        echo "$UNAME_MACHINE"-pc-uwin
         exit ;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
         echo x86_64-unknown-cygwin
         exit ;;
-    p*:CYGWIN*:*)
-        echo powerpcle-unknown-cygwin
-        exit ;;
     prep*:SunOS:5.*:*)
-        echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+        echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
         exit ;;
     *:GNU:*:*)
         # the GNU system
-        echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+        echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
         exit ;;
     *:GNU/*:*:*)
         # other systems with GNU libc and userland
-        echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+        echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
         exit ;;
     i*86:Minix:*:*)
-        echo ${UNAME_MACHINE}-pc-minix
+        echo "$UNAME_MACHINE"-pc-minix
         exit ;;
     aarch64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     aarch64_be:Linux:*:*)
         UNAME_MACHINE=aarch64_be
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     alpha:Linux:*:*)
@@ -902 +916 @@
         esac
         objdump --private-headers /bin/sh | grep -q ld.so.1
-        if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     arm*:Linux:*:*)
-        eval $set_cc_for_build
+        eval "$set_cc_for_build"
         if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
             | grep -q __ARM_EABI__
         then
-            echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+            echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         else
             if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
                 | grep -q __ARM_PCS_VFP
             then
-                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
             else
-                echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
             fi
         fi
         exit ;;
     avr32*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     cris:Linux:*:*)
-        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+        echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
         exit ;;
     crisv32:Linux:*:*)
-        echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+        echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
+        exit ;;
+    e2k:Linux:*:*)
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     frv:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     hexagon:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     i*86:Linux:*:*)
-        echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+        echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
         exit ;;
     ia64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+        exit ;;
+    k1om:Linux:*:*)
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     m32r*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     m68*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
+        eval "$set_cc_for_build"
+        sed 's/^        //' << EOF > "$dummy.c"
         #undef CPU
         #undef ${UNAME_MACHINE}
@@ -967 +987 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
+        test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
         ;;
+    mips64el:Linux:*:*)
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
+        exit ;;
     openrisc*:Linux:*:*)
-        echo or1k-unknown-linux-${LIBC}
+        echo or1k-unknown-linux-"$LIBC"
         exit ;;
     or32:Linux:*:* | or1k*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     padre:Linux:*:*)
-        echo sparc-unknown-linux-${LIBC}
+        echo sparc-unknown-linux-"$LIBC"
         exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-        echo hppa64-unknown-linux-${LIBC}
+        echo hppa64-unknown-linux-"$LIBC"
         exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
         # Look for CPU level
         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-          PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-          PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-          *)    echo hppa-unknown-linux-${LIBC} ;;
+          PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
+          PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
+          *)    echo hppa-unknown-linux-"$LIBC" ;;
         esac
         exit ;;
     ppc64:Linux:*:*)
-        echo powerpc64-unknown-linux-${LIBC}
+        echo powerpc64-unknown-linux-"$LIBC"
         exit ;;
     ppc:Linux:*:*)
-        echo powerpc-unknown-linux-${LIBC}
+        echo powerpc-unknown-linux-"$LIBC"
         exit ;;
     ppc64le:Linux:*:*)
-        echo powerpc64le-unknown-linux-${LIBC}
+        echo powerpc64le-unknown-linux-"$LIBC"
         exit ;;
     ppcle:Linux:*:*)
-        echo powerpcle-unknown-linux-${LIBC}
+        echo powerpcle-unknown-linux-"$LIBC"
+        exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-        echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+        echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
         exit ;;
     sh64*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     sh*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     tile*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     vax:Linux:*:*)
-        echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+        echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
         exit ;;
     x86_64:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        if objdump -f /bin/sh | grep -q elf32-x86-64; then
+            echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
+        else
+            echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+        fi
         exit ;;
     xtensa*:Linux:*:*)
-        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     i*86:DYNIX/ptx:4*:*)
@@ -1038 +1068 @@
         # I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
-        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+        echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION"
         exit ;;
     i*86:OS/2:*:*)
         # If we were able to find `uname', then EMX Unix compatibility
         # is probably installed.
-        echo ${UNAME_MACHINE}-pc-os2-emx
+        echo "$UNAME_MACHINE"-pc-os2-emx
         exit ;;
     i*86:XTS-300:*:STOP)
-        echo ${UNAME_MACHINE}-unknown-stop
+        echo "$UNAME_MACHINE"-unknown-stop
         exit ;;
     i*86:atheos:*:*)
-        echo ${UNAME_MACHINE}-unknown-atheos
+        echo "$UNAME_MACHINE"-unknown-atheos
         exit ;;
     i*86:syllable:*:*)
-        echo ${UNAME_MACHINE}-pc-syllable
+        echo "$UNAME_MACHINE"-pc-syllable
         exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-        echo i386-unknown-lynxos${UNAME_RELEASE}
+        echo i386-unknown-lynxos"$UNAME_RELEASE"
         exit ;;
     i*86:*DOS:*:*)
-        echo ${UNAME_MACHINE}-pc-msdosdjgpp
-        exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+        echo "$UNAME_MACHINE"-pc-msdosdjgpp
+        exit ;;
+    i*86:*:4.*:*)
+        UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
         if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-                echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+                echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL"
         else
-                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+                echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL"
         fi
         exit ;;
@@ -1075 +1105 @@
             *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
         esac
-        echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+        echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
         exit ;;
     i*86:*:3.2:*)
         if test -f /usr/options/cb.name; then
                 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+                echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL"
         elif /bin/uname -X 2>/dev/null >/dev/null ; then
                 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
@@ -1090 +1120 @@
                 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                         && UNAME_MACHINE=i686
-                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+                echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL"
         else
-                echo ${UNAME_MACHINE}-pc-sysv32
+                echo "$UNAME_MACHINE"-pc-sysv32
         fi
         exit ;;
@@ -1100 +1130 @@
         # the processor, so we play safe by assuming i586.
         # Note: whatever this is, it MUST be the same as what config.sub
-        # prints for the "djgpp" host, or else GDB configury will decide that
+        # prints for the "djgpp" host, or else GDB configure will decide that
         # this is a cross-build.
         echo i586-pc-msdosdjgpp
@@ -1112 +1142 @@
     i860:*:4.*:*) # i860-SVR4
         if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-          echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+          echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
         else # Add other i860-SVR4 vendors below as they are discovered.
-          echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+          echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
         fi
         exit ;;
@@ -1134 +1164 @@
         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+          && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
         /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+          && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
@@ -1145 +1175 @@
             && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-            && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+            && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
         /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-            && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+            && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
         /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-            && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+            && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-        echo m68k-unknown-lynxos${UNAME_RELEASE}
+        echo m68k-unknown-lynxos"$UNAME_RELEASE"
         exit ;;
     mc68030:UNIX_System_V:4.*:*)
@@ -1157 +1187 @@
         exit ;;
     TSUNAMI:LynxOS:2.*:*)
-        echo sparc-unknown-lynxos${UNAME_RELEASE}
+        echo sparc-unknown-lynxos"$UNAME_RELEASE"
         exit ;;
     rs6000:LynxOS:2.*:*)
-        echo rs6000-unknown-lynxos${UNAME_RELEASE}
+        echo rs6000-unknown-lynxos"$UNAME_RELEASE"
         exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-        echo powerpc-unknown-lynxos${UNAME_RELEASE}
+        echo powerpc-unknown-lynxos"$UNAME_RELEASE"
         exit ;;
     SM[BE]S:UNIX_SV:*:*)
-        echo mips-dde-sysv${UNAME_RELEASE}
+        echo mips-dde-sysv"$UNAME_RELEASE"
         exit ;;
     RM*:ReliantUNIX-*:*:*)
@@ -1177 +1207 @@
         if uname -p 2>/dev/null >/dev/null ; then
                 UNAME_MACHINE=`(uname -p) 2>/dev/null`
-                echo ${UNAME_MACHINE}-sni-sysv4
+                echo "$UNAME_MACHINE"-sni-sysv4
         else
                 echo ns32k-sni-sysv
@@ -1197 +1227 @@
     i*86:VOS:*:*)
         # From Paul.Green@stratus.com.
-        echo ${UNAME_MACHINE}-stratus-vos
+        echo "$UNAME_MACHINE"-stratus-vos
         exit ;;
     *:VOS:*:*)
@@ -1204 +1234 @@
         exit ;;
     mc68*:A/UX:*:*)
-        echo m68k-apple-aux${UNAME_RELEASE}
+        echo m68k-apple-aux"$UNAME_RELEASE"
         exit ;;
     news*:NEWS-OS:6*:*)
@@ -1211 +1241 @@
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
         if [ -d /usr/nec ]; then
-                echo mips-nec-sysv${UNAME_RELEASE}
+                echo mips-nec-sysv"$UNAME_RELEASE"
         else
-                echo mips-unknown-sysv${UNAME_RELEASE}
+                echo mips-unknown-sysv"$UNAME_RELEASE"
         fi
         exit ;;
@@ -1232 +1262 @@
         exit ;;
     SX-4:SUPER-UX:*:*)
-        echo sx4-nec-superux${UNAME_RELEASE}
+        echo sx4-nec-superux"$UNAME_RELEASE"
         exit ;;
     SX-5:SUPER-UX:*:*)
-        echo sx5-nec-superux${UNAME_RELEASE}
+        echo sx5-nec-superux"$UNAME_RELEASE"
         exit ;;
     SX-6:SUPER-UX:*:*)
-        echo sx6-nec-superux${UNAME_RELEASE}
+        echo sx6-nec-superux"$UNAME_RELEASE"
         exit ;;
     SX-7:SUPER-UX:*:*)
-        echo sx7-nec-superux${UNAME_RELEASE}
+        echo sx7-nec-superux"$UNAME_RELEASE"
         exit ;;
     SX-8:SUPER-UX:*:*)
-        echo sx8-nec-superux${UNAME_RELEASE}
+        echo sx8-nec-superux"$UNAME_RELEASE"
         exit ;;
     SX-8R:SUPER-UX:*:*)
-        echo sx8r-nec-superux${UNAME_RELEASE}
+        echo sx8r-nec-superux"$UNAME_RELEASE"
+        exit ;;
+    SX-ACE:SUPER-UX:*:*)
+        echo sxace-nec-superux"$UNAME_RELEASE"
         exit ;;
     Power*:Rhapsody:*:*)
-        echo powerpc-apple-rhapsody${UNAME_RELEASE}
+        echo powerpc-apple-rhapsody"$UNAME_RELEASE"
         exit ;;
     *:Rhapsody:*:*)
-        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
         exit ;;
     *:Darwin:*:*)
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        eval $set_cc_for_build
+        eval "$set_cc_for_build"
         if test "$UNAME_PROCESSOR" = unknown ; then
             UNAME_PROCESSOR=powerpc
         fi
-        if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-            if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+        if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
+            if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                    grep IS_64BIT_ARCH >/dev/null
+                       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                       grep IS_64BIT_ARCH >/dev/null
                 then
                     case $UNAME_PROCESSOR in
@@ -1271 +1304 @@
                         powerpc) UNAME_PROCESSOR=powerpc64 ;;
                     esac
+                fi
+                # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+                if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+                       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                       grep IS_PPC >/dev/null
+                then
+                    UNAME_PROCESSOR=powerpc
                 fi
             fi
@@ -1282 +1322 @@
             UNAME_PROCESSOR=x86_64
         fi
-        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+        echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
         exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
         UNAME_PROCESSOR=`uname -p`
-        if test "$UNAME_PROCESSOR" = "x86"; then
+        if test "$UNAME_PROCESSOR" = x86; then
                 UNAME_PROCESSOR=i386
                 UNAME_MACHINE=pc
         fi
-        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+        echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE"
         exit ;;
     *:QNX:*:4*)
         echo i386-pc-qnx
         exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-        echo neo-tandem-nsk${UNAME_RELEASE}
+    NEO-*:NONSTOP_KERNEL:*:*)
+        echo neo-tandem-nsk"$UNAME_RELEASE"
         exit ;;
     NSE-*:NONSTOP_KERNEL:*:*)
-        echo nse-tandem-nsk${UNAME_RELEASE}
-        exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-        echo nsr-tandem-nsk${UNAME_RELEASE}
+        echo nse-tandem-nsk"$UNAME_RELEASE"
+        exit ;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+        echo nsr-tandem-nsk"$UNAME_RELEASE"
+        exit ;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+        echo nsv-tandem-nsk"$UNAME_RELEASE"
+        exit ;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+        echo nsx-tandem-nsk"$UNAME_RELEASE"
         exit ;;
     *:NonStop-UX:*:*)
@@ -1311 +1357 @@
         exit ;;
     DS/*:UNIX_System_V:*:*)
-        echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+        echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE"
         exit ;;
     *:Plan9:*:*)
@@ -1317 +1363 @@
         # is converted to i386 for consistency with other x86
         # operating systems.
-        if test "$cputype" = "386"; then
+        if test "$cputype" = 386; then
             UNAME_MACHINE=i386
         else
             UNAME_MACHINE="$cputype"
         fi
-        echo ${UNAME_MACHINE}-unknown-plan9
+        echo "$UNAME_MACHINE"-unknown-plan9
         exit ;;
     *:TOPS-10:*:*)
@@ -1343 +1389 @@
         exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux"$UNAME_RELEASE"
         exit ;;
     *:DragonFly:*:*)
-        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
         exit ;;
     *:*VMS:*:*)
         UNAME_MACHINE=`(uname -p) 2>/dev/null`
-        case "${UNAME_MACHINE}" in
+        case "$UNAME_MACHINE" in
             A*) echo alpha-dec-vms ; exit ;;
             I*) echo ia64-dec-vms ; exit ;;
@@ -1359 +1405 @@
         exit ;;
     i*86:skyos:*:*)
-        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+        echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`"
         exit ;;
     i*86:rdos:*:*)
-        echo ${UNAME_MACHINE}-pc-rdos
+        echo "$UNAME_MACHINE"-pc-rdos
         exit ;;
     i*86:AROS:*:*)
-        echo ${UNAME_MACHINE}-pc-aros
+        echo "$UNAME_MACHINE"-pc-aros
         exit ;;
     x86_64:VMkernel:*:*)
-        echo ${UNAME_MACHINE}-unknown-esx
+        echo "$UNAME_MACHINE"-unknown-esx
+        exit ;;
+    amd64:Isilon\ OneFS:*:*)
+        echo x86_64-unknown-onefs
         exit ;;
 esac
 
+echo "$0: unable to guess system type" >&2
+
+case "$UNAME_MACHINE:$UNAME_SYSTEM" in
+    mips:Linux | mips64:Linux)
+        # If we got here on MIPS GNU/Linux, output extra information.
+        cat >&2 <<EOF
+
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+        ;;
+esac
+
 cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
+
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
@@ -1405 +1465 @@
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
 EOF
 
@@ -1414 +1474 @@
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"

trunk/config.sub

@@ -1 +1 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
-
-timestamp='2014-09-11'
+#   Copyright 1992-2018 Free Software Foundation, Inc.
+
+timestamp='2018-02-22'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -16 +16 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
@@ -26 +26 @@
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
@@ -34 +34 @@
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
@@ -54 +54 @@
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
@@ -69 +68 @@
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -96 +95 @@
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
@@ -114 +113 @@
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
   android-linux)
     os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     ;;
   *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
+    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
+    if [ "$basic_machine" != "$1" ]
+    then os=`echo "$1" | sed 's/.*-/-/'`
     else os=; fi
     ;;
@@ -180 +179 @@
         -sco6)
                 os=-sco5v6
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco5)
                 os=-sco3.2v5
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco4)
                 os=-sco3.2v4
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco3.2.[4-9]*)
                 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco3.2v[4-9]*)
                 # Don't forget version if it is 3.2v4 or newer.
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco5v6*)
                 # Don't forget version if it is 3.2v4 or newer.
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -sco*)
                 os=-sco3.2v2
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -udk*)
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -isc)
                 os=-isc2.2
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -clix*)
@@ -217 +216 @@
                 ;;
         -isc*)
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
                 ;;
         -lynx*178)
@@ -229 +228 @@
                 ;;
         -ptx*)
-                basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-                ;;
-        -windowsnt*)
-                os=`echo $os | sed -e 's/windowsnt/winnt/'`
+                basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
                 ;;
         -psos*)
@@ -256 +252 @@
         | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
         | avr | avr32 \
+        | ba \
         | be32 | be64 \
         | bfin \
         | c4x | c8051 | clipper \
         | d10v | d30v | dlx | dsp16xx \
-        | epiphany \
-        | fido | fr30 | frv \
+        | e2k | epiphany \
+        | fido | fr30 | frv | ft32 \
         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
         | hexagon \
-        | i370 | i860 | i960 | ia64 \
+        | i370 | i860 | i960 | ia16 | ia64 \
         | ip2k | iq2000 \
         | k1om \
@@ -300 +297 @@
         | ns16k | ns32k \
         | open8 | or1k | or1knd | or32 \
-        | pdp10 | pdp11 | pj | pjl \
+        | pdp10 | pj | pjl \
         | powerpc | powerpc64 | powerpc64le | powerpcle \
+        | pru \
         | pyramid \
         | riscv32 | riscv64 \
         | rl78 | rx \
         | score \
-        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
         | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -314 +312 @@
         | ubicom32 \
         | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-        | we32k \
+        | visium \
+        | wasm32 \
         | x86 | xc16x | xstormy16 | xtensa \
         | z8k | z80)
@@ -328 +327 @@
                 basic_machine=tic6x-unknown
                 ;;
+        leon|leon[3-9])
+                basic_machine=sparc-$basic_machine
+                ;;
         m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
                 basic_machine=$basic_machine-unknown
                 os=-none
                 ;;
-        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
                 ;;
         ms1)
@@ -361 +363 @@
         # Object if more than one company name word.
         *-*-*)
-                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+                echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
                 exit 1
                 ;;
@@ -373 +375 @@
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
         | avr-* | avr32-* \
+        | ba-* \
         | be32-* | be64-* \
         | bfin-* | bs2000-* \
@@ -378 +381 @@
         | c8051-* | clipper-* | craynv-* | cydra-* \
         | d10v-* | d30v-* | dlx-* \
-        | elxsi-* \
+        | e2k-* | elxsi-* \
         | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
         | h8300-* | h8500-* \
         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
         | hexagon-* \
-        | i*86-* | i860-* | i960-* | ia64-* \
+        | i*86-* | i860-* | i960-* | ia16-* | ia64-* \
         | ip2k-* | iq2000-* \
         | k1om-* \
@@ -424 +427 @@
         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+        | pru-* \
         | pyramid-* \
+        | riscv32-* | riscv64-* \
         | rl78-* | romp-* | rs6000-* | rx-* \
         | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
@@ -430 +435 @@
         | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
         | tahoe-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -438 +443 @@
         | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
         | vax-* \
+        | visium-* \
+        | wasm32-* \
         | we32k-* \
         | x86-* | x86_64-* | xc16x-* | xps100-* \
@@ -451 +458 @@
         # for a CPU type and a company and sometimes even an OS.
         386bsd)
-                basic_machine=i386-unknown
+                basic_machine=i386-pc
                 os=-bsd
                 ;;
@@ -485 +492 @@
                 ;;
         amd64-*)
-                basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         amdahl)
@@ -514 +521 @@
                 os=-aros
                 ;;
+        asmjs)
+                basic_machine=asmjs-unknown
+                ;;
         aux)
                 basic_machine=m68k-apple
@@ -527 +537 @@
                 ;;
         blackfin-*)
-                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 os=-linux
                 ;;
@@ -535 +545 @@
                 ;;
         c54x-*)
-                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         c55x-*)
-                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         c6x-*)
-                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         c90)
@@ -630 +640 @@
                 os=-bosx
                 ;;
-        dpx2* | dpx2*-bull)
+        dpx2*)
                 basic_machine=m68k-bull
                 os=-sysv3
+                ;;
+        e500v[12])
+                basic_machine=powerpc-unknown
+                os=$os"spe"
+                ;;
+        e500v[12]-*)
+                basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                os=$os"spe"
                 ;;
         ebmon29k)
@@ -723 +741 @@
                 basic_machine=hppa1.0-hp
                 ;;
-        hppa-next)
-                os=-nextstep3
-                ;;
         hppaosf)
                 basic_machine=hppa1.1-hp
@@ -738 +753 @@
                 ;;
         i*86v32)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
                 os=-sysv32
                 ;;
         i*86v4*)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
                 os=-sysv4
                 ;;
         i*86v)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
                 os=-sysv
                 ;;
         i*86sol2)
-                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
                 os=-solaris2
                 ;;
@@ -757 +772 @@
                 os=-mach
                 ;;
-        i386-vsta | vsta)
+        vsta)
                 basic_machine=i386-unknown
                 os=-vsta
@@ -775 +790 @@
                 os=-sysv
                 ;;
+        leon-*|leon[3-9]-*)
+                basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
+                ;;
         m68knommu)
                 basic_machine=m68k-unknown
@@ -780 +798 @@
                 ;;
         m68knommu-*)
-                basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 os=-linux
-                ;;
-        m88k-omron*)
-                basic_machine=m88k-omron
                 ;;
         magnum | m3230)
@@ -817 +832 @@
                 ;;
         mips3*-*)
-                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+                basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
                 ;;
         mips3*)
-                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+                basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
                 ;;
         monitor)
@@ -839 +854 @@
                 ;;
         ms1-*)
-                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+                basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
                 ;;
         msys)
@@ -881 +896 @@
                 os=-sysv
                 ;;
-        next | m*-next )
+        next | m*-next)
                 basic_machine=m68k-next
                 case $os in
@@ -926 +941 @@
                 basic_machine=nsr-tandem
                 ;;
+        nsv-tandem)
+                basic_machine=nsv-tandem
+                ;;
+        nsx-tandem)
+                basic_machine=nsx-tandem
+                ;;
         op50n-* | op60c-*)
                 basic_machine=hppa1.1-oki
@@ -958 +979 @@
                 ;;
         parisc-*)
-                basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 os=-linux
                 ;;
@@ -974 +995 @@
                 ;;
         pc98-*)
-                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
@@ -989 +1010 @@
                 ;;
         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         pentiumpro-* | p6-* | 6x86-* | athlon-*)
-                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         pentium4-*)
-                basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         pn)
@@ -1008 +1029 @@
                 ;;
         ppc-* | ppcbe-*)
-                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppcle | powerpclittle | ppc-le | powerpc-little)
+                basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                ;;
+        ppcle | powerpclittle)
                 basic_machine=powerpcle-unknown
                 ;;
         ppcle-* | powerpclittle-*)
-                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         ppc64)  basic_machine=powerpc64-unknown
                 ;;
-        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-                ;;
-        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+        ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+                ;;
+        ppc64le | powerpc64little)
                 basic_machine=powerpc64le-unknown
                 ;;
         ppc64le-* | powerpc64little-*)
-                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         ps2)
@@ -1078 +1099 @@
                 basic_machine=i386-sequent
                 ;;
-        sh)
-                basic_machine=sh-hitachi
-                os=-hms
-                ;;
         sh5el)
                 basic_machine=sh5le-unknown
                 ;;
-        sh64)
-                basic_machine=sh64-unknown
-                ;;
-        sparclite-wrs | simso-wrs)
+        simso-wrs)
                 basic_machine=sparclite-wrs
                 os=-vxworks
@@ -1107 +1121 @@
                 ;;
         strongarm-* | thumb-*)
-                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+                basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
                 ;;
         sun2)
@@ -1229 +1243 @@
                 os=-proelf
                 ;;
+        x64)
+                basic_machine=x86_64-pc
+                ;;
         xbox)
                 basic_machine=i686-pc
@@ -1237 +1254 @@
                 ;;
         xscale-* | xscalee[bl]-*)
-                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+                basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
                 ;;
         ymp)
                 basic_machine=ymp-cray
                 os=-unicos
-                ;;
-        z8k-*-coff)
-                basic_machine=z8k-unknown
-                os=-sim
-                ;;
-        z80-*-coff)
-                basic_machine=z80-unknown
-                os=-sim
                 ;;
         none)
@@ -1279 +1288 @@
                 basic_machine=vax-dec
                 ;;
-        pdp10)
-                # there are many clones, so DEC is not a safe bet
-                basic_machine=pdp10-unknown
-                ;;
         pdp11)
                 basic_machine=pdp11-dec
@@ -1292 +1297 @@
                 basic_machine=sh-unknown
                 ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-                basic_machine=sparc-sun
-                ;;
         cydra)
                 basic_machine=cydra-cydrome
@@ -1314 +1316 @@
                 ;;
         *)
-                echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+                echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
                 exit 1
                 ;;
@@ -1322 +1324 @@
 case $basic_machine in
         *-digital*)
-                basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+                basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
                 ;;
         *-commodore*)
-                basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+                basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
                 ;;
         *)
@@ -1336 +1338 @@
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+        # First match some system type aliases that might get confused
+        # with valid system types.
         # -solaris* is a basic system type, with this one exception.
         -auroraux)
@@ -1348 +1350 @@
                 os=-solaris2
                 ;;
-        -svr4*)
-                os=-sysv4
-                ;;
         -unixware*)
                 os=-sysv4.2uw
@@ -1357 +1356 @@
                 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
                 ;;
-        # First accept the basic system types.
+        # es1800 is here to avoid being matched by es* (a different OS)
+        -es1800*)
+                os=-ose
+                ;;
+        # Now accept the basic system types.
         # The portable systems comes first.
-        # Each alternative MUST END IN A *, to match a version number.
+        # Each alternative MUST end in a * to match a version number.
         # -sysv* is not here because it comes later, after sysvr4.
         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -1366 +1369 @@
               | -sym* | -kopensolaris* | -plan9* \
               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-              | -aos* | -aros* \
+              | -aos* | -aros* | -cloudabi* | -sortix* \
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-              | -bitrig* | -openbsd* | -solidbsd* \
+              | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-              | -chorusos* | -chorusrdb* | -cegcc* \
+              | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
               | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+              | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
               | -linux-newlib* | -linux-musl* | -linux-uclibc* \
               | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
-              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+              | -morphos* | -superux* | -rtmk* | -windiss* \
               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+              | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
+              | -midnightbsd*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1403 +1408 @@
                 os=`echo $os | sed -e 's|nto|nto-qnx|'`
                 ;;
-        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+        -sim | -xray | -os68k* | -v88r* \
+              | -windows* | -osx | -abug | -netware* | -os9* \
               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
                 ;;
         -mac*)
-                os=`echo $os | sed -e 's|mac|macos|'`
+                os=`echo "$os" | sed -e 's|mac|macos|'`
                 ;;
         -linux-dietlibc)
@@ -1417 +1422 @@
                 ;;
         -sunos5*)
-                os=`echo $os | sed -e 's|sunos5|solaris2|'`
+                os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
                 ;;
         -sunos6*)
-                os=`echo $os | sed -e 's|sunos6|solaris3|'`
+                os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
                 ;;
         -opened*)
@@ -1431 +1436 @@
                 os=-wince
                 ;;
-        -osfrose*)
-                os=-osfrose
-                ;;
-        -osf*)
-                os=-osf
-                ;;
         -utek*)
                 os=-bsd
@@ -1461 +1460 @@
                 os=-rtmk-nova
                 ;;
-        -ns2 )
+        -ns2)
                 os=-nextstep2
                 ;;
@@ -1483 +1482 @@
                 os=-sysv3
                 ;;
-        -svr4)
+        -svr4*)
                 os=-sysv4
                 ;;
@@ -1498 +1497 @@
                 os=-ose
                 ;;
-        -es1800*)
-                os=-ose
-                ;;
-        -xenix)
-                os=-xenix
-                ;;
         -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
                 os=-mint
                 ;;
-        -aros*)
-                os=-aros
-                ;;
         -zvmoe)
                 os=-zvmoe
@@ -1516 +1506 @@
                 os=-dicos
                 ;;
+        -pikeos*)
+                # Until real need of OS specific support for
+                # particular features comes up, bare metal
+                # configurations are quite functional.
+                case $basic_machine in
+                    arm*)
+                        os=-eabi
+                        ;;
+                    *)
+                        os=-elf
+                        ;;
+                esac
+                ;;
         -nacl*)
+                ;;
+        -ios)
                 ;;
         -none)
@@ -1523 +1528 @@
                 # Get rid of the `-' at the beginning of $os.
                 os=`echo $os | sed 's/[^-]*-//'`
-                echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+                echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
                 exit 1
                 ;;
@@ -1613 +1618 @@
                 os=-sunos4.1.1
                 ;;
+        pru-*)
+                os=-elf
+                ;;
         *-be)
                 os=-beos
                 ;;
-        *-haiku)
-                os=-haiku
-                ;;
         *-ibm)
                 os=-aix
@@ -1658 +1663 @@
                 os=-luna
                 ;;
-        *-next )
+        *-next)
                 os=-nextstep
                 ;;
@@ -1672 +1677 @@
         i370-*)
                 os=-mvs
-                ;;
-        *-next)
-                os=-nextstep3
                 ;;
         *-gould)
@@ -1785 +1787 @@
                                 ;;
                 esac
-                basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+                basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
                 ;;
 esac
 
-echo $basic_machine$os
+echo "$basic_machine$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'write-file-functions 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"

trunk/docs/Changelog

@@ -1 +1 @@
 4.3.3:
+        * fix broken 'make deb' makefile target
+        * eliminate obsolete 'sstrip' utility
+        * systemd support 
+        * fix broken rpm specfile (patch by Franky Van L.)
+        * fix broken mysql init script
         * fix some issues with link-time optimisation (option -flto with
         recent gcc versions)

trunk/init/samhain.startSystemd.in

@@ -2 +2 @@
 [Unit]
 Description=The @install_name@ Service
-After=network.target syslog.target remote-fs.target nss-user-lookup.target
+After=network.target remote-fs.target nss-user-lookup.target
 
 [Service]

trunk/rules.deb-light.in

@@ -8 +8 @@
 #
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=9
+%:
+        dh $@ --with-autoreconf
 
-package=@install_name@
 
-# CAVEAT: including the --enable-base= option is for packages to be
-#         distributed INTERNALLY on your network, NOT for packages
-#         to be distributed to THIRD PARTIES
+override_dh_clean:
+        [ ! -f Makefile ] || $(MAKE) distclean
+        -rm -f samhainrc.install
+        -rm -f build-stamp build-server-stamp build-client-stamp
+        dh_clean
 
-build: build-stamp
-build-stamp:
-        dh_testdir
+override_dh_auto_configure:
         @top_srcdir@/configure @mydefargs@
-        $(MAKE) 
-        echo '#!/bin/sh' > ./sstrip
-        echo 'echo "*** SSTRIP DISABLED ***"' >> ./sstrip
+
+override_dh_auto_build:
+        dh_auto_build
         if ! test x$(PASSWORD) = x; then \
                 if test -f samhain_setpwd; then \
@@ -34 +31 @@
                 fi; \
         fi
-        touch build-stamp
 
-clean:
-        dh_testdir
-        dh_testroot
-        rm -f build-stamp
-        -[ -f Makefile ] && $(MAKE) distclean
-        dh_clean
-
-install: build
-        dh_testdir
-        dh_testroot
-        dh_clean -k
-        dh_installdirs
-
+override_dh_auto_install:
         $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/@install_name@
-        # $(MAKE) install-light install-boot DESTDIR=`pwd`/debian/tmp
-
-        # However, remove the rc.d links
-        -rm -rf `pwd`/debian/tmp/etc/rc?.d
-
-        # Remove samhain_stealth for light install
-        -rm -f `pwd`/debian/tmp/@sbindir@/@install_name@_stealth
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
 
 
-# Build architecture-dependent files here.
-binary-arch: build install
-#       dh_testversion
-        dh_testdir
-        dh_testroot
-        dh_installdebconf       
-        # dh_installdocs
-        dh_installmenu
-        dh_installinit -- defaults 19
-        [ -f debian/@install_name@.postinst.debhelper ] && \
-                cd debian && \
-                cat @install_name@.postinst.debhelper | \
-                    sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \
-                    mv postinst.tmp @install_name@.postinst.debhelper
-        [ -f debian/@install_name@.postinst.debhelper ] && \
-                cd debian && \
-                cat @install_name@.postinst.debhelper | \
-                    sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \
-                    mv postinst.tmp @install_name@.postinst.debhelper
-        [ -f debian/@install_name@.prerm.debhelper ] && \
-                cd debian && \
-                cat @install_name@.prerm.debhelper | \
-                    sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
-                    mv prerm.tmp @install_name@.prerm.debhelper
-        [ -f debian/@install_name@.prerm.debhelper ] && \
-                cd debian && \
-                cat @install_name@.prerm.debhelper | \
-                    sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
-                    mv prerm.tmp @install_name@.prerm.debhelper
-        # dh_installmanpages
-        # dh_installchangelogs @top_srcdir@/docs/Changelog
-        dh_link
-        dh_strip
-        dh_compress
+override_dh_install:
+        # However, remove the rc.d links
+        -rm -rf `pwd`/debian/@install_name@/etc/rc?.d
+        # Remove samhain_stealth for light install
+        -rm -f `pwd`/debian/@install_name@/@sbindir@/@install_name@_stealth
+        # remove samhain_setpwd if not needed
+        if ! test x$(PASSWORD) = x; then \
+                rm -f `pwd`/debian/@install_name@/@sbindir@/@install_name@_setpwd; \
+        fi
+
+override_dh_installdocs:
+        # do nothing
+
+override_dh_installchangelogs:
+        # do nothing
+
+override_dh_installman:
+        # do nothing
+
+override_dh_installinit:
+        dh_installinit --no-start -- defaults 19
+
+override_dh_usrlocal:
+        # do nothing
+
+override_dh_fixperms:
         dh_fixperms
-        dh_installdeb
-        dh_shlibdeps
-        dh_gencontrol
-        dh_md5sums
-        dh_builddeb
+        # Fix the permissions
+        chmod o-rX `pwd`/debian/@install_name@/@mydataroot@ \
+                `pwd`/debian/@install_name@/@myconffile@
+        if ! test "x@mylogdir@" = "x/var/log"; then \
+                chmod o-rX `pwd`/debian/@install_name@/@mylogdir@; \
+        fi
 
 
-define checkdir
-        test -f debian/rules
-endef
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-

trunk/rules.deb.in

@@ -8 +8 @@
 #
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+        dh $@ --with-autoreconf
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=9
+override_dh_clean:
+        [ ! -f Makefile ] || $(MAKE) distclean
+        -rm -f samhainrc.install
+        -rm -f build-stamp build-server-stamp build-client-stamp
+        dh_clean
 
-package=@install_name@
+override_dh_auto_configure:
+        @top_srcdir@/configure @mydefargs@
 
-# CAVEAT: including the --enable-base= option is for packages to be
-#         distributed INTERNALLY on your network, NOT for packages
-#         to be distributed to THIRD PARTIES
-
-build: build-stamp
-build-stamp:
-        dh_testdir
-        @top_srcdir@/configure @mydefargs@
-        $(MAKE) 
-        echo '#!/bin/sh' > ./sstrip
-        echo 'echo "*** SSTRIP DISABLED ***"' >> ./sstrip
+override_dh_auto_build:
+        dh_auto_build
         if ! test x$(PASSWORD) = x; then \
                 if test -f samhain_setpwd; then \
@@ -34 +29 @@
                 fi; \
         fi
-        touch build-stamp
 
-clean:
-        dh_testdir
-        dh_testroot
-        rm -f build-stamp
-        -[ -f Makefile ] && $(MAKE) distclean
-        dh_clean
-
-install: build
-        dh_testdir
-        dh_testroot
-        dh_clean -k
-        dh_installdirs
-
-        # Fix the permissions
-        #chmod o-rX `pwd`/debian/tmp/var/log/samhain \
-        #       `pwd`/debian/tmp/var/run/samhain \
-        #       `pwd`/debian/tmp/var/lib/samhain \
-        #       `pwd`/debian/tmp/etc/samhain
-
-        # $(MAKE) install install-boot DESTDIR=`pwd`/debian/tmp
+override_dh_auto_install:
         $(MAKE) install install-boot DESTDIR=`pwd`/debian/@install_name@
 
+override_dh_install:
         # However, remove the rc.d links
-        -rm -rf `pwd`/debian/tmp/etc/rc?.d
+        -rm -rf `pwd`/debian/@install_name@/etc/rc?.d
 
-        # install -m 755 encode `pwd`/debian/tmp/usr/bin/samhain_encode
-
-        # install -m 644 profiles/debianlinux_i386/samhainrc `pwd`/debian/tmp@myconffile@
-        # install -m 644 debian/samhain.logrotate `pwd`/debian/tmp/etc/logrotate.d/samhain
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-
-# Build architecture-dependent files here.
-binary-arch: build install
-#       dh_testversion
-        dh_testdir
-        dh_testroot
-        dh_installdebconf       
-        dh_installdocs 
+override_dh_installdocs:
+        dh_installdocs
         [ -f debian/@install_name@/usr/share/doc/@install_name@/MANUAL-2_4.html.tar ] && \
                 cd debian/@install_name@/usr/share/doc/@install_name@ && \
                 tar xf MANUAL-2_4.html.tar && mv MANUAL-2_4 manual.html && \
-                rm -f MANUAL-2_4.html.tar && \
+                rm -f MANUAL-2_4.html.tar
+        [ -f debian/@install_name@/usr/share/doc/@install_name@/MANUAL-2_4.pdf ] && \
+                cd debian/@install_name@/usr/share/doc/@install_name@ && \
                 mv MANUAL-2_4.pdf manual.pdf
-        dh_installexamples @top_srcdir@/scripts/example_pager.pl \
-                @top_srcdir@/scripts/example_sms.pl \
-                @top_srcdir@/scripts/concat.pl \
-                @top_srcdir@/scripts/samhain.logrotator \
-                @top_srcdir@/scripts/samhainadmin.pl \
-                @top_srcdir@/scripts/check_samhain.pl \
-                @top_srcdir@/yulerc.template \
-                @top_srcdir@/samhainrc.linux
-        dh_installmenu
-        dh_installinit -- defaults 19
-        [ -f debian/@install_name@.postinst.debhelper ] && \
-                cd debian && \
-                cat @install_name@.postinst.debhelper | \
-                    sed 's%/etc/init.d/@install_name@ start%:%' > postinst.tmp && \
-                    mv postinst.tmp @install_name@.postinst.debhelper
-        [ -f debian/@install_name@.postinst.debhelper ] && \
-                cd debian && \
-                cat @install_name@.postinst.debhelper | \
-                    sed 's%invoke-rc.d @install_name@ start%:%' > postinst.tmp && \
-                    mv postinst.tmp @install_name@.postinst.debhelper
-        [ -f debian/@install_name@.prerm.debhelper ] && \
-                cd debian && \
-                cat @install_name@.prerm.debhelper | \
-                    sed 's%/etc/init.d/@install_name@ stop%/etc/init.d/@install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
-                    mv prerm.tmp @install_name@.prerm.debhelper
-        [ -f debian/@install_name@.prerm.debhelper ] && \
-                cd debian && \
-                cat @install_name@.prerm.debhelper | \
-                    sed 's%invoke-rc.d @install_name@ stop%invoke-rc.d @install_name@ stop || echo service @install_name@ already stopped%' > prerm.tmp && \
-                    mv prerm.tmp @install_name@.prerm.debhelper
-        # dh_installmanpages
-        dh_installchangelogs @top_srcdir@/docs/Changelog
-        dh_link
-        dh_strip
-        dh_compress
+
+override_dh_installchangelogs:
+        dh_installchangelogs docs/Changelog
+
+override_dh_installinit:
+        dh_installinit --no-start -- defaults 19
+
+override_dh_usrlocal:
+        # do nothing
+
+override_dh_fixperms:
         dh_fixperms
-        dh_installdeb
-        dh_shlibdeps
-        dh_gencontrol
-        dh_md5sums
-        dh_builddeb
+        # Fix the permissions
+        chmod o-rX `pwd`/debian/@install_name@/@mydataroot@ \
+                `pwd`/debian/@install_name@/@myconffile@
+        if ! test "x@mylogdir@" = "x/var/log"; then \
+                chmod o-rX `pwd`/debian/@install_name@/@mylogdir@; \
+        fi
 
-
-define checkdir
-        test -f debian/rules
-endef
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-