imported 9.0.300

[ckermit.git] / makefile

diff --git a/makefile b/makefile
index 454d3e4..176bc4e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,9 +1,8 @@
 # makefile / Makefile / ckuker.mak / CKUKER.MAK
 #
-# Tue Jun 21 13:04:45 2011
-BUILDID=20110621
-CKVER= "9.0.299"
-TESTID= "Beta.02"
+# Thu Jun 30 07:31:33 2011
+BUILDID=20110630
+CKVER= "9.0.300"
 #
 # -- Makefile to build C-Kermit for UNIX and UNIX-like platforms --
 #
@@ -695,8 +694,7 @@ TESTID= "Beta.02"
 # ? for Solaris 8 on SPARC or Intel, GNU CC, "make solaris8g".
 # + for Solaris 9 on SPARC (or Intel?), 32-bit, SunPro CC, "make solaris9".
 # + for Solaris 9 on SPARC (or Intel?), 32-bit, GNU CC, "make solaris9g".
-# + for Solaris 9 on SPARC 100% 64-bit, SunPro CC, "make solaris9_64".
-# + for Solaris 9 on SPARC (or Intel?), 64-bit, GNU CC, "make solaris9g64".
+# ? for Solaris 9 on SPARC (or Intel?), 64-bit, GNU CC, "make solaris9g64".
 # + for Solaris 10 on SPARC (or Intel?), 32-bit, SunPro CC, "make solaris10".
 # + for Solaris 10 on SPARC 64-bit, SunPro CC, "make solaris10_64".
 # + for Solaris 10 on SPARC (or Intel?), 32-bit, GNU CC, "make solaris10g".
@@ -3878,15 +3876,6 @@ solaris9g solaris10g solaris11g:
        -D_FILE_OFFSET_BITS=64 $(KFLAGS)" \
        "LIBS= -ltermlib -lsocket -lnsl -lm -lresolv -lpam $(LIBS)"
 
-#Solaris 9, 10, or 11 with Sun CC, 64 bit build.
-#DON'T USE THIS ONE ON PC ARCHITECTURE - It compiles and links but won't run.
-#OK: 2009/11/16 (but not tested on Solaris 11)
-solaris9_64 solaris10_64 solaris11_64:
-       @echo 'Making C-Kermit $(CKVER) for Solaris 9/10/11 64-bit Sun CC'
-       $(MAKE) "MAKE=$(MAKE)" solaris9 KTARGET=$${KTARGET:-$(@)} \
-       "KFLAGS=-xarch=generic64 -U_FILE_OFFSET_BITS -DNOARROWKEYS" \
-       "LNKFLAGS= -xarch=generic64"
-
 #Solaris 9, 10, or 11 with gcc, 64 bit build.
 #Peeking inside FILE struct not allowed in 64-bit world.
 #DON'T USE THIS ONE ON PC ARCHITECTURE - It compiles and links but won't run.
@@ -6111,6 +6100,8 @@ linux:
        `if test -n '$$HAVE_OPENPTY'; then echo -lutil; fi` \
        `if test -f /usr/lib64/libresolv.a || test -f /usr/lib64/libresolv.so \
        || test -f /usr/lib/libresolv.a || test -f /usr/lib/libresolv.so \
+       || test -f /usr/lib/i386-linux-gnu/libresolv.a \
+       || test -f /usr/lib/i386-linux-gnu/libresolv.so \
        || ls /lib/x86_64-linux-gnu/libresolv.* > /dev/null 2> /dev/null; \
        then echo -lresolv; fi` \
        `if test -f /usr/lib64/libcrypt.a || test -f /usr/lib64/libcrypt.so \