diff options
author | dillo <dillo> | 2003-07-13 14:34:48 +0000 |
---|---|---|
committer | dillo <dillo> | 2003-07-13 14:34:48 +0000 |
commit | 3fd658921aa434971248050237cf9419da3888c8 (patch) | |
tree | 8d675a1627fa41ec20885c945ad9af17060978cc | |
parent | 28365dbfc8dd17f77ca65e3f221db3131c8227af (diff) | |
download | pkgsrc-3fd658921aa434971248050237cf9419da3888c8.tar.gz |
upgrade to 2.30
does no longer include (copies of) libintl and libiconv
numerous enhancements and bug fixes, see included NEWS file
-rw-r--r-- | lang/clisp/Makefile | 16 | ||||
-rw-r--r-- | lang/clisp/PLIST | 22 | ||||
-rw-r--r-- | lang/clisp/distinfo | 23 | ||||
-rw-r--r-- | lang/clisp/patches/patch-aa | 31 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ab | 8 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ac | 8 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ad | 8 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ae | 8 | ||||
-rw-r--r-- | lang/clisp/patches/patch-af | 42 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ag | 8 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ah | 12 | ||||
-rw-r--r-- | lang/clisp/patches/patch-ai | 48 |
12 files changed, 145 insertions, 89 deletions
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile index 3035fa68ea0..b8189a72e8c 100644 --- a/lang/clisp/Makefile +++ b/lang/clisp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2003/07/13 13:52:19 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2003/07/13 14:34:48 dillo Exp $ -DISTNAME= clisp-2.27 -PKGREVISION= 2 +DISTNAME= clisp-2.30 WRKSRC= ${WRKDIR}/${DISTNAME}/src CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clisp/} @@ -15,7 +14,8 @@ NOT_FOR_PLATFORM= *-*-alpha # severe LP64 problems USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES -CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \ + gt_cv_func_gnugettext2_libintl=yes GNU_CONFIGURE= YES UNLIMIT_RESOURCES= stacksize USE_LIBTOOL= YES @@ -26,16 +26,18 @@ LIBTOOL_OVERRIDE+= ${WRKSRC}/callback/trampoline_r/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/libiconv/libcharset/libtool LIBTOOL_OVERRIDE+= ${WRKSRC}/libiconv/libtool ${WRKSRC}/sigsegv/libtool +USE_GNU_READLINE= YES + post-patch: ${CP} files/tramp-rs6000-netbsd.o ${WRKSRC}/../ffcall/callback/trampoline_r ${CP} files/tramp-rs6000-netbsd.s ${WRKSRC}/../ffcall/callback/trampoline_r ${CP} files/vacall-rs6000-netbsd.s ${WRKSRC}/../ffcall/callback/vacall_r do-configure: - cd ${WRKSRC}; \ + cd ${WRKSRC} && \ (cd .. ; ${SETENV} ${CONFIGURE_ENV} \ ${CONFIGURE_SCRIPT} --host=${MACHINE_GNU_PLATFORM} \ - --prefix=${PREFIX}); \ + --prefix=${PREFIX}) && \ ./makemake --prefix=${LOCALBASE} --with-readline --with-gettext \ --with-dynamic-ffi --fsstnd=netbsd >Makefile @@ -43,5 +45,7 @@ pre-build: cd ${WRKSRC}/avcall && ${MAKE} cd ${WRKSRC}/callback && ${MAKE} +.include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST index f12fe76ec7d..adbe185c25e 100644 --- a/lang/clisp/PLIST +++ b/lang/clisp/PLIST @@ -1,12 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2002/12/01 14:51:44 salo Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/07/13 14:34:49 dillo Exp $ bin/clisp lib/clisp/base/libavcall.a lib/clisp/base/libcallback.a -lib/clisp/base/libiconv.a -lib/clisp/base/libintl.a +lib/clisp/base/libcharset.a lib/clisp/base/libnoreadline.a -lib/clisp/base/libreadline.a -lib/clisp/base/libsigsegv.a lib/clisp/base/lisp.a lib/clisp/base/lisp.run lib/clisp/base/lispinit.mem @@ -18,11 +15,8 @@ lib/clisp/data/UnicodeData.txt lib/clisp/data/clhs.txt lib/clisp/full/libavcall.a lib/clisp/full/libcallback.a -lib/clisp/full/libiconv.a -lib/clisp/full/libintl.a +lib/clisp/full/libcharset.a lib/clisp/full/libnoreadline.a -lib/clisp/full/libreadline.a -lib/clisp/full/libsigsegv.a lib/clisp/full/lisp.a lib/clisp/full/lisp.run lib/clisp/full/lispinit.mem @@ -33,7 +27,6 @@ lib/clisp/linkkit/clisp.h lib/clisp/linkkit/modules.c lib/clisp/linkkit/modules.d man/man1/clisp.1 -man/man3/clreadline.3 share/doc/clisp/ANNOUNCE share/doc/clisp/CLOS-guide.txt share/doc/clisp/COPYRIGHT @@ -47,14 +40,11 @@ share/doc/clisp/README.es share/doc/clisp/SUMMARY share/doc/clisp/clisp.1 share/doc/clisp/clisp.dvi -share/doc/clisp/clisp.gif share/doc/clisp/clisp.html -share/doc/clisp/clreadline.3 -share/doc/clisp/clreadline.dvi -share/doc/clisp/clreadline.html +share/doc/clisp/clisp.png share/doc/clisp/editors.txt +share/doc/clisp/impnotes.css share/doc/clisp/impnotes.html -share/doc/clisp/readline.dvi ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/clisp.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/clisplow.mo ${PKGLOCALEDIR}/locale/en/LC_MESSAGES/clisp.mo @@ -65,6 +55,8 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/clisp.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/clisplow.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/clisp.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/clisplow.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/clisp.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/clisplow.mo @dirrm share/doc/clisp @dirrm lib/clisp/linkkit @dirrm lib/clisp/full diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo index b0f33ab7165..c0c8deb5a1a 100644 --- a/lang/clisp/distinfo +++ b/lang/clisp/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.4 2002/03/14 07:44:22 jmc Exp $ +$NetBSD: distinfo,v 1.5 2003/07/13 14:34:49 dillo Exp $ -SHA1 (clisp-2.27.tar.bz2) = ee0a9bfcb9c4d86bdcb8e0bfd3b9ff3defe4c1a8 -Size (clisp-2.27.tar.bz2) = 8965902 bytes -SHA1 (patch-aa) = 1151b28bf18cd4a3137f014c66e6a0d09da1756e -SHA1 (patch-ab) = 0e56664e15f66c2d8c5465aa3b0dd8493e50a179 -SHA1 (patch-ac) = 25e3fe8944ae8d7aa6c7d44c075d5f9d2d12c31e -SHA1 (patch-ad) = 18d3a6973ca29fd10b73f6f49a0801a4db24605e -SHA1 (patch-ae) = 5f60ddf54028a724c4d6be391645383874642042 -SHA1 (patch-af) = 0d14872e6c7efa32361c6722b6d8ae6e8cb05902 -SHA1 (patch-ag) = 25d995296e3af6ad007d11508e3ef9bb4a990164 -SHA1 (patch-ah) = e230ba8eeb1e7a2fe363aa99d4e7094446c9ab1f +SHA1 (clisp-2.30.tar.bz2) = 7335116934d30cb327f4724047a1362498b85520 +Size (clisp-2.30.tar.bz2) = 5652698 bytes +SHA1 (patch-aa) = 7c5375242feafab3a568eee373d0fef685896f5b +SHA1 (patch-ab) = a830152fefc8db8a0504e7a7d3886fd2d11af601 +SHA1 (patch-ac) = 3f18f9859e5f93fe524845f98678c147c901cab2 +SHA1 (patch-ad) = c5c5808e78121dd398f76ba612b265e39978a7b1 +SHA1 (patch-ae) = 7fe957edd58e42f943a33908472042e0c42869d8 +SHA1 (patch-af) = a7c13cf848c370b676458a5b2e46a8fdcf4caa7f +SHA1 (patch-ag) = 5ad9fe11abdea49780bdd0a01bf697d8ad07123c +SHA1 (patch-ah) = ab42e8107d24a6ac86992aad5aa335ad33cfac62 +SHA1 (patch-ai) = 89f19718514b813b008ed92de8b538c76d341a53 diff --git a/lang/clisp/patches/patch-aa b/lang/clisp/patches/patch-aa index b3d3e28af87..2c76502dc20 100644 --- a/lang/clisp/patches/patch-aa +++ b/lang/clisp/patches/patch-aa @@ -1,18 +1,29 @@ -$NetBSD: patch-aa,v 1.9 2002/02/21 04:13:21 dillo Exp $ +$NetBSD: patch-aa,v 1.10 2003/07/13 14:34:49 dillo Exp $ ---- ../configure.orig Tue May 8 16:09:59 2001 +--- ../configure.orig Thu Sep 5 02:06:40 2002 +++ ../configure -@@ -512,13 +512,6 @@ - makemake_args="$makemake_args --with-nogettext" - fi - fi +@@ -7,6 +7,9 @@ + # configure make.gcc gcc (deprecated) + # configure make.cc cc (deprecated) + ++# strip leading spaces, which lead to problems later on ++CPPFLAGS="`echo $CPPFLAGS`" ++ + info_help () { + cat << \EOP + Usage: configure [options] [dirname] +@@ -437,14 +443,6 @@ if test -n "$do_config"; then + done + rm -f config.cache; # avoid problems with stale caches + cd .. +-fi +- -if test -d $ABS_DIRNAME/avcall -a -d $ABS_DIRNAME/callback; then - (cd $ABS_DIRNAME/avcall && make) && - (cd $ABS_DIRNAME/callback && make) && - (cd $ABS_DIRNAME/avcall && make check) && - (cd $ABS_DIRNAME/callback && make check) && -- makemake_args="$makemake_args --with-dynamic-ffi" --fi - - if test -z "$do_build"; then +- makemake_args="--with-dynamic-ffi $makemake_args" + fi + makemake_args="${makemake_args} ${target} ${debug}"; diff --git a/lang/clisp/patches/patch-ab b/lang/clisp/patches/patch-ab index f5b51f87779..3f51650baf8 100644 --- a/lang/clisp/patches/patch-ab +++ b/lang/clisp/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-ab,v 1.5 2003/07/13 14:34:49 dillo Exp $ ---- .././ffcall/avcall/Makefile.in.orig Tue Jun 12 07:31:01 2001 -+++ .././ffcall/avcall/Makefile.in Wed Mar 6 05:38:16 2002 -@@ -117,12 +117,12 @@ +--- .././ffcall/avcall/Makefile.in.orig Sun Mar 24 19:51:37 2002 ++++ .././ffcall/avcall/Makefile.in +@@ -120,12 +120,12 @@ avcall-rs6000.lo : $(srcdir)/avcall-rs60 case "$(OS)" in \ aix3*) syntax=aix.old;; \ aix*) syntax=aix.new;; \ diff --git a/lang/clisp/patches/patch-ac b/lang/clisp/patches/patch-ac index f7293a7d226..e5a50110e5a 100644 --- a/lang/clisp/patches/patch-ac +++ b/lang/clisp/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-ac,v 1.5 2003/07/13 14:34:49 dillo Exp $ ---- .././ffcall/vacall/Makefile.in.orig Tue Mar 5 09:50:39 2002 -+++ .././ffcall/vacall/Makefile.in Wed Mar 6 05:38:50 2002 -@@ -108,11 +108,11 @@ +--- .././ffcall/vacall/Makefile.in.orig Sun Mar 24 19:51:37 2002 ++++ .././ffcall/vacall/Makefile.in +@@ -111,11 +111,11 @@ vacall-rs6000.o : $(srcdir)/vacall-rs600 case "$(OS)" in \ aix3*) syntax=aix.old;; \ aix*) syntax=aix.new;; \ diff --git a/lang/clisp/patches/patch-ad b/lang/clisp/patches/patch-ad index a3ae8a80c97..3255084da93 100644 --- a/lang/clisp/patches/patch-ad +++ b/lang/clisp/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-ad,v 1.5 2003/07/13 14:34:49 dillo Exp $ ---- ../ffcall/callback/vacall_r/Makefile.in.orig Tue Jun 12 07:31:01 2001 -+++ ../ffcall/callback/vacall_r/Makefile.in Thu Mar 14 07:13:43 2002 -@@ -118,11 +118,12 @@ +--- .././ffcall/callback/vacall_r/Makefile.in.orig Sun Mar 24 19:51:37 2002 ++++ .././ffcall/callback/vacall_r/Makefile.in +@@ -121,11 +121,12 @@ vacall-rs6000.lo : $(srcdir)/vacall-rs60 aix3*) syntax=aix.old;; \ aix*) syntax=aix.new;; \ linux*) syntax=linux;; \ diff --git a/lang/clisp/patches/patch-ae b/lang/clisp/patches/patch-ae index eb56286eca0..870aeb0a998 100644 --- a/lang/clisp/patches/patch-ae +++ b/lang/clisp/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-ae,v 1.5 2003/07/13 14:34:49 dillo Exp $ ---- ../ffcall/callback/trampoline_r/Makefile.in.orig Tue Mar 5 09:57:45 2002 -+++ ../ffcall/callback/trampoline_r/Makefile.in Tue Mar 5 09:57:54 2002 -@@ -90,7 +90,7 @@ +--- .././ffcall/callback/trampoline_r/Makefile.in.orig Sun Mar 24 19:51:37 2002 ++++ .././ffcall/callback/trampoline_r/Makefile.in +@@ -93,7 +93,7 @@ cache-hppa.lo : $(srcdir)/cache-hppa.s $(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/cache-hppa.s cache-rs6000.lo : $(srcdir)/cache-rs6000-sysv4.s diff --git a/lang/clisp/patches/patch-af b/lang/clisp/patches/patch-af index 9bcde07ce0d..5d12f8c1366 100644 --- a/lang/clisp/patches/patch-af +++ b/lang/clisp/patches/patch-af @@ -1,22 +1,22 @@ -$NetBSD: patch-af,v 1.3 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-af,v 1.4 2003/07/13 14:34:49 dillo Exp $ ---- lispbibl.d.orig Tue Mar 5 20:53:41 2002 -+++ lispbibl.d Tue Mar 5 20:55:32 2002 -@@ -1400,7 +1400,7 @@ - #define intBWsize intBsize - #define intWLsize intWsize - #define intBWLsize intBsize -- #elif (defined(MC680X0) && defined(HPUX_ASSEMBLER)) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(CONVEX) || defined(S390) -+ #elif (defined(MC680X0) && defined(HPUX_ASSEMBLER)) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(CONVEX) || defined(S390) || defined(__powerpc__) - # Der Sparc-Prozessor kann mit uintB und uintW schlecht rechnen. - # Anderen 32-Bit-Prozessoren geht es genauso. - #define intBWsize intWsize -@@ -1593,7 +1593,7 @@ - #define intDsize 16 - #define intDDsize 32 # = 2*intDsize - #define log2_intDsize 4 # = log2(intDsize) -- #elif defined(MC680Y0) || defined(I80386) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(VAX) || defined(CONVEX) || defined(ARM) || defined(DECALPHA) || defined(IA64) || defined(S390) -+ #elif defined(MC680Y0) || defined(I80386) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(VAX) || defined(CONVEX) || defined(ARM) || defined(DECALPHA) || defined(IA64) || defined(S390) || defined(__powerpc__) - #define intDsize 32 - #define intDDsize 64 # = 2*intDsize - #define log2_intDsize 5 # = log2(intDsize) +--- lispbibl.d.orig Thu Sep 12 10:14:09 2002 ++++ lispbibl.d +@@ -1438,7 +1438,7 @@ typedef unsigned_int_with_n_bits(pointer + #define intBWsize intBsize + #define intWLsize intWsize + #define intBWLsize intBsize +-#elif (defined(MC680X0) && defined(HPUX_ASSEMBLER)) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(CONVEX) || defined(S390) ++#elif (defined(MC680X0) && defined(HPUX_ASSEMBLER)) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(CONVEX) || defined(S390) || defined(__powerpc__) + # The Sparc-processor computes rather badly with uintB and uintW. + # Other 32-Bit-processoren have similar weaknesses. + #define intBWsize intWsize +@@ -1631,7 +1631,7 @@ typedef unsigned_int_with_n_bits(intBWLs + #define intDsize 16 + #define intDDsize 32 # = 2*intDsize + #define log2_intDsize 4 # = log2(intDsize) +-#elif defined(MC680Y0) || defined(I80386) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(VAX) || defined(CONVEX) || defined(ARM) || defined(DECALPHA) || defined(IA64) || defined(S390) ++#elif defined(MC680Y0) || defined(I80386) || defined(SPARC) || defined(HPPA) || defined(MIPS) || defined(M88000) || defined(RS6000) || defined(VAX) || defined(CONVEX) || defined(ARM) || defined(DECALPHA) || defined(IA64) || defined(S390) || defined(__powerpc__) + #define intDsize 32 + #define intDDsize 64 # = 2*intDsize + #define log2_intDsize 5 # = log2(intDsize) diff --git a/lang/clisp/patches/patch-ag b/lang/clisp/patches/patch-ag index 788019f9d13..6ed22c44467 100644 --- a/lang/clisp/patches/patch-ag +++ b/lang/clisp/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-ag,v 1.2 2003/07/13 14:34:49 dillo Exp $ ---- ../ffcall/callback/trampoline_r/test1.c.orig Thu Mar 14 07:22:04 2002 -+++ ../ffcall/callback/trampoline_r/test1.c Thu Mar 14 07:22:07 2002 -@@ -69,7 +69,11 @@ +--- ../ffcall/callback/trampoline_r/test1.c.orig Wed May 8 10:11:49 2002 ++++ ../ffcall/callback/trampoline_r/test1.c +@@ -70,7 +70,11 @@ register void* env __asm__("%r29"); register void* env __asm__("r12"); #endif #ifdef __rs6000__ diff --git a/lang/clisp/patches/patch-ah b/lang/clisp/patches/patch-ah index c44067c027b..f0452133f10 100644 --- a/lang/clisp/patches/patch-ah +++ b/lang/clisp/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.1 2002/03/14 07:44:23 jmc Exp $ +$NetBSD: patch-ah,v 1.2 2003/07/13 14:34:49 dillo Exp $ ---- ../ffcall/callback/trampoline_r/trampoline.c.orig Thu Mar 14 07:23:32 2002 -+++ ../ffcall/callback/trampoline_r/trampoline.c Thu Mar 14 07:23:35 2002 +--- ../ffcall/callback/trampoline_r/trampoline.c.orig Tue Jul 2 10:11:01 2002 ++++ ../ffcall/callback/trampoline_r/trampoline.c @@ -21,12 +21,16 @@ #endif #endif @@ -19,7 +19,7 @@ $NetBSD: patch-ah,v 1.1 2002/03/14 07:44:23 jmc Exp $ #if defined(__hppanew__) /* * A function pointer is a biased pointer to a data area whose first word -@@ -259,7 +263,7 @@ +@@ -259,7 +263,7 @@ extern int shmctl (); #include <sys/syslocal.h> #endif /* Inline assembly function for instruction cache flush. */ @@ -28,7 +28,7 @@ $NetBSD: patch-ah,v 1.1 2002/03/14 07:44:23 jmc Exp $ #ifdef __GNUC__ extern inline #if defined(__sparc__) || defined(__sparc64__) -@@ -336,7 +340,7 @@ +@@ -336,7 +340,7 @@ extern void __TR_clear_cache(); #define TRAMP_LENGTH 32 #define TRAMP_ALIGN 4 #endif @@ -37,7 +37,7 @@ $NetBSD: patch-ah,v 1.1 2002/03/14 07:44:23 jmc Exp $ #define TRAMP_LENGTH 24 #define TRAMP_ALIGN 4 #endif -@@ -872,6 +876,39 @@ +@@ -910,6 +914,39 @@ __TR_function alloc_trampoline_r (addres #define is_tramp(function) \ *(unsigned short *) (function + 0) == 0x3D60 && \ *(unsigned short *) (function + 4) == 0x616B && \ diff --git a/lang/clisp/patches/patch-ai b/lang/clisp/patches/patch-ai new file mode 100644 index 00000000000..ea26eb0fb6e --- /dev/null +++ b/lang/clisp/patches/patch-ai @@ -0,0 +1,48 @@ +$NetBSD: patch-ai,v 1.1 2003/07/13 14:35:33 dillo Exp $ + +--- makemake.in.orig Sun Sep 8 02:34:17 2002 ++++ makemake.in +@@ -337,6 +337,7 @@ case $# in + GROFF='@GROFF@' # either 'groff' or '' + GMALLOC='@GMALLOC@' # either 'gmalloc' or '' + LIBS='@LIBS@' # list of system libraries ++ LDFLAGS='@LDFLAGS@' # additional options for linking + LIBTERMCAP='@LIBTERMCAP@' # either '-ltermcap' or '-lncurses' + LIBDL='@LIBDL@' # either '-ldl' or '' + LIBICONV='@LIBICONV@' # either '-liconv' or '' +@@ -1654,9 +1655,9 @@ echol "prefix = ${PREFIX}" + echol "exec_prefix = ${EXEC_PREFIX}" + echol "bindir = \$(exec_prefix)${NEXT_}bin" + echol "shared = \$(prefix)${NEXT_}share" +-echol "mandir = \$(prefix)${NEXT_}share${NEXT_}man" +-echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}html" +-echol "dvidir = \$(prefix)${NEXT_}share${NEXT_}dvi" ++echol "mandir = \$(prefix)${NEXT_}man" ++echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}doc${NEXT_}html" ++echol "dvidir = \$(prefix)${NEXT_}share${NEXT_}doc" + echol "docdir = \$(prefix)${NEXT_}share${NEXT_}doc" + case "$fsstnd" in + suse) +@@ -1721,11 +1722,13 @@ else + echol "CPP = ${XCPP}" + echol "CLFLAGS = ${XCLFLAGS}" + echol "LIBS = ${LIBS}" ++ echol "LDFLAGS = ${LDFLAGS}" + XCC="\$(CC)" + XCFLAGS="\$(CFLAGS)" + XCPP="\$(CPP)" + XCLFLAGS="\$(CLFLAGS)" + LIBS="\$(LIBS)" ++ LDFLAGS="\$(LDFLAGS)" + fi + echol "X_LIBS = ${X_LIBS}" + X_LIBS="\$(X_LIBS)" +@@ -2620,7 +2623,7 @@ if [ $HOS != os2 -a $HOS != win32 ] ; th + LIBGCC_DIR='`'"${XCC} -print-libgcc-file-name"' | sed -e '"'"'s,[^/]*$$,,'"'"'`' + echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE} || /usr/ccs/bin/ld -V -dy -Bdynamic -Y P,/usr/ccs/lib:/usr/lib -Qy -o lisp${LEXE} ${LIBGCC_DIR}crt1.o ${LIBGCC_DIR}crti.o /usr/ccs/lib/values-Xa.o ${LIBGCC_DIR}crtbegin.o \$(OBJECTS) modules${TOBJ} -L${LIBGCC_DIR} -L/usr/ccs/bin ${LIBS} -lgcc -lc ${LIBGCC_DIR}crtend.o ${LIBGCC_DIR}crtn.o -lgcc" + else +- echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}" ++ echotab "${XCC} ${XCFLAGS} ${XCLFLAGS} ${LDFLAGS} \$(OBJECTS) modules${TOBJ} ${LIBS} -o lisp${LEXE}" + fi + if [ $HOS = unix ] ; then + echotab "-sync" |