From 17aae3e9720576a6142a70515354132a45a25d83 Mon Sep 17 00:00:00 2001 From: Ying-Chieh Liao Date: Tue, 9 Apr 2002 08:19:17 +0000 Subject: upgrade to 20020208 PR: 36922 Submitted by: maintainer --- japanese/emacs-emcws/Makefile | 7 +++++-- japanese/emacs-emcws/distinfo | 2 +- japanese/emacs-emcws/files/patch-ag | 2 +- japanese/emacs-emcws/files/patch-an | 15 ++++++++++++--- japanese/emacs-emcws/files/patch-da | 30 +++++++++++++----------------- japanese/emacs20-emcws/Makefile | 7 +++++-- japanese/emacs20-emcws/distinfo | 2 +- japanese/emacs20-emcws/files/patch-ag | 2 +- japanese/emacs20-emcws/files/patch-an | 15 ++++++++++++--- japanese/emacs20-emcws/files/patch-da | 30 +++++++++++++----------------- japanese/emacs21-emcws/Makefile | 7 +++++-- japanese/emacs21-emcws/distinfo | 2 +- japanese/emacs21-emcws/files/patch-ag | 2 +- japanese/emacs21-emcws/files/patch-an | 15 ++++++++++++--- japanese/emacs21-emcws/files/patch-da | 30 +++++++++++++----------------- 15 files changed, 96 insertions(+), 72 deletions(-) (limited to 'japanese') diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index 97cd04822a94..dda0da1cb9d0 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -8,7 +8,7 @@ PORTNAME= emcws PORTVERSION= 20.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -16,7 +16,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20011002.gz +PATCHFILES= emcws-${EMACS_VER}-20020208.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org @@ -134,6 +134,7 @@ pre-build: @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ + egg.el wnn-egg.el \ ange-ftp.el help.el international/ccl.el international/mule-cmds.el \ international/mule.el international/titdic-cnv.el) ${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1 @@ -159,6 +160,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lisp/$$i \ ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \ done + @test -d ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} || \ + ${MKDIR} ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} @${INSTALL_DATA} ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el \ ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.el @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \ diff --git a/japanese/emacs-emcws/distinfo b/japanese/emacs-emcws/distinfo index d46a0d934c63..4635c4a8126d 100644 --- a/japanese/emacs-emcws/distinfo +++ b/japanese/emacs-emcws/distinfo @@ -1,2 +1,2 @@ MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5 -MD5 (emcws-20.7-20011002.gz) = 05c64fd467fbd7942b5cb9af32a2e907 +MD5 (emcws-20.7-20020208.gz) = 750b2df254aed3b6775755ffc277f989 diff --git a/japanese/emacs-emcws/files/patch-ag b/japanese/emacs-emcws/files/patch-ag index 127f1b628290..8b4c708b396b 100644 --- a/japanese/emacs-emcws/files/patch-ag +++ b/japanese/emacs-emcws/files/patch-ag @@ -5,7 +5,7 @@ # The makeinfo program is part of the Texinfo distribution. -MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-split ++MAKEINFO = makeinfo --no-split --force INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \ ../info/dired-x ../info/ediff ../info/forms ../info/gnus \ ../info/info ../info/message ../info/mh-e ../info/reftex \ diff --git a/japanese/emacs-emcws/files/patch-an b/japanese/emacs-emcws/files/patch-an index 0335a0d948e6..3186c8a1caa3 100644 --- a/japanese/emacs-emcws/files/patch-an +++ b/japanese/emacs-emcws/files/patch-an @@ -1,7 +1,7 @@ ---- man/emacs.texi.orig Fri Jun 25 02:53:58 1999 -+++ man/emacs.texi Sat Jul 24 01:09:24 1999 +--- man/emacs.texi.orig Tue Jun 13 04:12:20 2000 ++++ man/emacs.texi Tue Apr 9 16:23:13 2002 @@ -11,9 +11,9 @@ - updated for Emacs version 20.4 + updated for Emacs version 20.7. @c Please REMEMBER to update edition number in *three* places in this file. -@dircategory Editors @@ -12,3 +12,12 @@ @end direntry Published by the Free Software Foundation +@@ -119,7 +119,7 @@ + Emacs is the extensible, customizable, self-documenting real-time + display editor. This Info file describes how to edit with Emacs and + some of how to customize it; it corresponds to GNU Emacs version 20.7. +-For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The ++For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The + Emacs Lisp Reference Manual}. + @end ifinfo + diff --git a/japanese/emacs-emcws/files/patch-da b/japanese/emacs-emcws/files/patch-da index 474cf14be1d5..6b265eec285d 100644 --- a/japanese/emacs-emcws/files/patch-da +++ b/japanese/emacs-emcws/files/patch-da @@ -1,37 +1,33 @@ ---- configure.in.orig Wed Nov 28 15:25:17 2001 -+++ configure.in Wed Nov 28 15:26:42 2001 -@@ -35,13 +35,21 @@ +--- configure.in.orig Fri Feb 22 15:50:26 2002 ++++ configure.in Fri Feb 22 15:55:10 2002 +@@ -35,18 +35,26 @@ dnl A case that the LEIM package does not exist. dnl - locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\ + locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\ -'${datadir}/emacs/site-lisp' +'${datadir}/emacs/site-lisp:'\ +'${datadir}/emacs/${version}/site-lisp:'\ -+'${datadir}/emacs/${version}-emcws/lisp:'\ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\ +'${datadir}/emacs/${version}/lisp' else dnl dnl A case that the LEIM package exists. dnl - locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\ --'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}-emcws/leim' + locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\ +-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim' +'${datadir}/emacs/site-lisp:'\ -+'${datadir}/emacs/${version}-emcws/leim:'\ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\ +'${datadir}/emacs/${version}/site-lisp:'\ +'${datadir}/emacs/${version}/leim:'\ -+'${datadir}/emacs/${version}-emcws/lisp:'\ -+'${datadir}/emacs/${version}/lisp'\ - echo - echo modifying leim/Makefile.in for emcws - mv ${srcdir}/leim/Makefile.in ${srcdir}/leim/Makefile.in.orig -@@ -53,8 +61,8 @@ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\ ++'${datadir}/emacs/${version}/lisp' fi lisppath='${locallisppath}:${lispdir}' --etcdir='${datadir}/emacs/${version}-emcws/etc' --archlibdir='${libexecdir}/emacs/${version}-emcws/${configuration}' +-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc' +-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}' +etcdir='${datadir}/emacs/${version}/etc' +archlibdir='${libexecdir}/emacs/${version}/${configuration}' - docdir='${datadir}/emacs/${version}-emcws/etc' + docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc' AC_ARG_WITH(gcc, diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile index 97cd04822a94..dda0da1cb9d0 100644 --- a/japanese/emacs20-emcws/Makefile +++ b/japanese/emacs20-emcws/Makefile @@ -8,7 +8,7 @@ PORTNAME= emcws PORTVERSION= 20.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -16,7 +16,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20011002.gz +PATCHFILES= emcws-${EMACS_VER}-20020208.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org @@ -134,6 +134,7 @@ pre-build: @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ + egg.el wnn-egg.el \ ange-ftp.el help.el international/ccl.el international/mule-cmds.el \ international/mule.el international/titdic-cnv.el) ${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1 @@ -159,6 +160,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lisp/$$i \ ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \ done + @test -d ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} || \ + ${MKDIR} ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} @${INSTALL_DATA} ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el \ ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.el @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \ diff --git a/japanese/emacs20-emcws/distinfo b/japanese/emacs20-emcws/distinfo index d46a0d934c63..4635c4a8126d 100644 --- a/japanese/emacs20-emcws/distinfo +++ b/japanese/emacs20-emcws/distinfo @@ -1,2 +1,2 @@ MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5 -MD5 (emcws-20.7-20011002.gz) = 05c64fd467fbd7942b5cb9af32a2e907 +MD5 (emcws-20.7-20020208.gz) = 750b2df254aed3b6775755ffc277f989 diff --git a/japanese/emacs20-emcws/files/patch-ag b/japanese/emacs20-emcws/files/patch-ag index 127f1b628290..8b4c708b396b 100644 --- a/japanese/emacs20-emcws/files/patch-ag +++ b/japanese/emacs20-emcws/files/patch-ag @@ -5,7 +5,7 @@ # The makeinfo program is part of the Texinfo distribution. -MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-split ++MAKEINFO = makeinfo --no-split --force INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \ ../info/dired-x ../info/ediff ../info/forms ../info/gnus \ ../info/info ../info/message ../info/mh-e ../info/reftex \ diff --git a/japanese/emacs20-emcws/files/patch-an b/japanese/emacs20-emcws/files/patch-an index 0335a0d948e6..3186c8a1caa3 100644 --- a/japanese/emacs20-emcws/files/patch-an +++ b/japanese/emacs20-emcws/files/patch-an @@ -1,7 +1,7 @@ ---- man/emacs.texi.orig Fri Jun 25 02:53:58 1999 -+++ man/emacs.texi Sat Jul 24 01:09:24 1999 +--- man/emacs.texi.orig Tue Jun 13 04:12:20 2000 ++++ man/emacs.texi Tue Apr 9 16:23:13 2002 @@ -11,9 +11,9 @@ - updated for Emacs version 20.4 + updated for Emacs version 20.7. @c Please REMEMBER to update edition number in *three* places in this file. -@dircategory Editors @@ -12,3 +12,12 @@ @end direntry Published by the Free Software Foundation +@@ -119,7 +119,7 @@ + Emacs is the extensible, customizable, self-documenting real-time + display editor. This Info file describes how to edit with Emacs and + some of how to customize it; it corresponds to GNU Emacs version 20.7. +-For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The ++For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The + Emacs Lisp Reference Manual}. + @end ifinfo + diff --git a/japanese/emacs20-emcws/files/patch-da b/japanese/emacs20-emcws/files/patch-da index 474cf14be1d5..6b265eec285d 100644 --- a/japanese/emacs20-emcws/files/patch-da +++ b/japanese/emacs20-emcws/files/patch-da @@ -1,37 +1,33 @@ ---- configure.in.orig Wed Nov 28 15:25:17 2001 -+++ configure.in Wed Nov 28 15:26:42 2001 -@@ -35,13 +35,21 @@ +--- configure.in.orig Fri Feb 22 15:50:26 2002 ++++ configure.in Fri Feb 22 15:55:10 2002 +@@ -35,18 +35,26 @@ dnl A case that the LEIM package does not exist. dnl - locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\ + locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\ -'${datadir}/emacs/site-lisp' +'${datadir}/emacs/site-lisp:'\ +'${datadir}/emacs/${version}/site-lisp:'\ -+'${datadir}/emacs/${version}-emcws/lisp:'\ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\ +'${datadir}/emacs/${version}/lisp' else dnl dnl A case that the LEIM package exists. dnl - locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\ --'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}-emcws/leim' + locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\ +-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim' +'${datadir}/emacs/site-lisp:'\ -+'${datadir}/emacs/${version}-emcws/leim:'\ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\ +'${datadir}/emacs/${version}/site-lisp:'\ +'${datadir}/emacs/${version}/leim:'\ -+'${datadir}/emacs/${version}-emcws/lisp:'\ -+'${datadir}/emacs/${version}/lisp'\ - echo - echo modifying leim/Makefile.in for emcws - mv ${srcdir}/leim/Makefile.in ${srcdir}/leim/Makefile.in.orig -@@ -53,8 +61,8 @@ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\ ++'${datadir}/emacs/${version}/lisp' fi lisppath='${locallisppath}:${lispdir}' --etcdir='${datadir}/emacs/${version}-emcws/etc' --archlibdir='${libexecdir}/emacs/${version}-emcws/${configuration}' +-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc' +-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}' +etcdir='${datadir}/emacs/${version}/etc' +archlibdir='${libexecdir}/emacs/${version}/${configuration}' - docdir='${datadir}/emacs/${version}-emcws/etc' + docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc' AC_ARG_WITH(gcc, diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile index 97cd04822a94..dda0da1cb9d0 100644 --- a/japanese/emacs21-emcws/Makefile +++ b/japanese/emacs21-emcws/Makefile @@ -8,7 +8,7 @@ PORTNAME= emcws PORTVERSION= 20.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs @@ -16,7 +16,7 @@ DISTNAME= emacs-${PORTVERSION} PATCH_SITES= ftp://ftp.ki.nu/pub/emcws/ \ ftp://ftp.jpl.org/pub/misc/ -PATCHFILES= emcws-${EMACS_VER}-20011002.gz +PATCHFILES= emcws-${EMACS_VER}-20020208.gz PATCH_DIST_STRIP= -p1 MAINTAINER= nakaji@jp.freebsd.org @@ -134,6 +134,7 @@ pre-build: @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} emacs) @(cd ${WRKSRC}/src/../lisp; \ ${WRKSRC}/src/emacs -batch -q -f batch-byte-compile \ + egg.el wnn-egg.el \ ange-ftp.el help.el international/ccl.el international/mule-cmds.el \ international/mule.el international/titdic-cnv.el) ${RM} -f ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-${EMACS_VER}.1 @@ -159,6 +160,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lisp/$$i \ ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/$$i; \ done + @test -d ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} || \ + ${MKDIR} ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET} @${INSTALL_DATA} ${WRKSRC}/lib-src/fns-emcws-${EMACS_VER}.1.el \ ${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/fns-emcws-${EMACS_VER}.1.el @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \ diff --git a/japanese/emacs21-emcws/distinfo b/japanese/emacs21-emcws/distinfo index d46a0d934c63..4635c4a8126d 100644 --- a/japanese/emacs21-emcws/distinfo +++ b/japanese/emacs21-emcws/distinfo @@ -1,2 +1,2 @@ MD5 (emacs-20.7.tar.gz) = c732cf5e668d4ac67d9418ecb103ecf5 -MD5 (emcws-20.7-20011002.gz) = 05c64fd467fbd7942b5cb9af32a2e907 +MD5 (emcws-20.7-20020208.gz) = 750b2df254aed3b6775755ffc277f989 diff --git a/japanese/emacs21-emcws/files/patch-ag b/japanese/emacs21-emcws/files/patch-ag index 127f1b628290..8b4c708b396b 100644 --- a/japanese/emacs21-emcws/files/patch-ag +++ b/japanese/emacs21-emcws/files/patch-ag @@ -5,7 +5,7 @@ # The makeinfo program is part of the Texinfo distribution. -MAKEINFO = makeinfo -+MAKEINFO = makeinfo --no-split ++MAKEINFO = makeinfo --no-split --force INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \ ../info/dired-x ../info/ediff ../info/forms ../info/gnus \ ../info/info ../info/message ../info/mh-e ../info/reftex \ diff --git a/japanese/emacs21-emcws/files/patch-an b/japanese/emacs21-emcws/files/patch-an index 0335a0d948e6..3186c8a1caa3 100644 --- a/japanese/emacs21-emcws/files/patch-an +++ b/japanese/emacs21-emcws/files/patch-an @@ -1,7 +1,7 @@ ---- man/emacs.texi.orig Fri Jun 25 02:53:58 1999 -+++ man/emacs.texi Sat Jul 24 01:09:24 1999 +--- man/emacs.texi.orig Tue Jun 13 04:12:20 2000 ++++ man/emacs.texi Tue Apr 9 16:23:13 2002 @@ -11,9 +11,9 @@ - updated for Emacs version 20.4 + updated for Emacs version 20.7. @c Please REMEMBER to update edition number in *three* places in this file. -@dircategory Editors @@ -12,3 +12,12 @@ @end direntry Published by the Free Software Foundation +@@ -119,7 +119,7 @@ + Emacs is the extensible, customizable, self-documenting real-time + display editor. This Info file describes how to edit with Emacs and + some of how to customize it; it corresponds to GNU Emacs version 20.7. +-For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The ++For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The + Emacs Lisp Reference Manual}. + @end ifinfo + diff --git a/japanese/emacs21-emcws/files/patch-da b/japanese/emacs21-emcws/files/patch-da index 474cf14be1d5..6b265eec285d 100644 --- a/japanese/emacs21-emcws/files/patch-da +++ b/japanese/emacs21-emcws/files/patch-da @@ -1,37 +1,33 @@ ---- configure.in.orig Wed Nov 28 15:25:17 2001 -+++ configure.in Wed Nov 28 15:26:42 2001 -@@ -35,13 +35,21 @@ +--- configure.in.orig Fri Feb 22 15:50:26 2002 ++++ configure.in Fri Feb 22 15:55:10 2002 +@@ -35,18 +35,26 @@ dnl A case that the LEIM package does not exist. dnl - locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\ + locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\ -'${datadir}/emacs/site-lisp' +'${datadir}/emacs/site-lisp:'\ +'${datadir}/emacs/${version}/site-lisp:'\ -+'${datadir}/emacs/${version}-emcws/lisp:'\ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\ +'${datadir}/emacs/${version}/lisp' else dnl dnl A case that the LEIM package exists. dnl - locallisppath='${datadir}/emacs/${version}-emcws/site-lisp:'\ --'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}-emcws/leim' + locallisppath='${datadir}/emacs/${version}$(EMACS_POSTFIX)/site-lisp:'\ +-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim' +'${datadir}/emacs/site-lisp:'\ -+'${datadir}/emacs/${version}-emcws/leim:'\ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/leim:'\ +'${datadir}/emacs/${version}/site-lisp:'\ +'${datadir}/emacs/${version}/leim:'\ -+'${datadir}/emacs/${version}-emcws/lisp:'\ -+'${datadir}/emacs/${version}/lisp'\ - echo - echo modifying leim/Makefile.in for emcws - mv ${srcdir}/leim/Makefile.in ${srcdir}/leim/Makefile.in.orig -@@ -53,8 +61,8 @@ ++'${datadir}/emacs/${version}$(EMACS_POSTFIX)/lisp:'\ ++'${datadir}/emacs/${version}/lisp' fi lisppath='${locallisppath}:${lispdir}' --etcdir='${datadir}/emacs/${version}-emcws/etc' --archlibdir='${libexecdir}/emacs/${version}-emcws/${configuration}' +-etcdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc' +-archlibdir='${libexecdir}/emacs/${version}$(EMACS_POSTFIX)/${configuration}' +etcdir='${datadir}/emacs/${version}/etc' +archlibdir='${libexecdir}/emacs/${version}/${configuration}' - docdir='${datadir}/emacs/${version}-emcws/etc' + docdir='${datadir}/emacs/${version}$(EMACS_POSTFIX)/etc' AC_ARG_WITH(gcc, -- cgit v1.2.3