pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/navi2ch Fix installation when XEmacs is used.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cae8f88d59f1
branches:  trunk
changeset: 477138:cae8f88d59f1
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Sun Jun 27 05:34:43 2004 +0000

description:
Fix installation when XEmacs is used.

diffstat:

 chat/navi2ch/Makefile |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 3e1d555d6975 -r cae8f88d59f1 chat/navi2ch/Makefile
--- a/chat/navi2ch/Makefile     Sun Jun 27 01:13:50 2004 +0000
+++ b/chat/navi2ch/Makefile     Sun Jun 27 05:34:43 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/06/26 06:59:39 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2004/06/27 05:34:43 uebayasi Exp $
 
 DISTNAME=      navi2ch-1.7.3
 CATEGORIES=    chat
@@ -14,12 +14,22 @@
 USE_GNU_TOOLS+=        make
 .if ${EMACS_FLAVOR} == "emacs"
 CONFIGURE_ARGS+=--with-emacs
-CONFIGURE_ARGS+=--with-icondir=${PREFIX}/share/navi2ch/icons
 CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/navi2ch
 .else
 CONFIGURE_ARGS+=--with-xemacs
-CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX}
+CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||}
 .endif
+CONFIGURE_ARGS+=--with-icondir=${PREFIX}/share/navi2ch/icons
+
+# XXX  Don't overwrite infodir when XEmacs is used.  In this case infodir
+#      must be set by --with-infodir (or --infodir?).  This should be
+#      fixed in the original distribution.
+SUBST_CLASSES+=                infodir
+SUBST_STAGE.infodir=   post-patch
+SUBST_MESSAGE.infodir= Avoid default infodir is overwritten when XEmacs is used
+SUBST_FILES.infodir=   configure configure.in
+SUBST_SED.infodir=     -e '/infodir=.*packagedir/d'
+CONFIGURE_ARGS+=--with-infodir=${PREFIX}/info
 
 INFO_FILES=    navi2ch.info
 



Home | Main Index | Thread Index | Old Index