From 15ed3cd5d59b7e81af5d1d97504e68a1c760c338 Mon Sep 17 00:00:00 2001
From: jtb <jtb>
Date: Wed, 13 Dec 2000 22:27:11 +0000
Subject: Make sure we install cweb with the same PREFIX as teTeX (TeX won't
 find the macros otherwise). Get rid of the INSTALL file. Added extra @unexec
 rmdir to PLIST.

---
 devel/cweb/Makefile    | 8 ++++----
 devel/cweb/pkg/INSTALL | 1 -
 devel/cweb/pkg/PLIST   | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 devel/cweb/pkg/INSTALL

(limited to 'devel')

diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 71e7c60de79..3332e428ca5 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/25 17:23:27 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/13 22:27:11 jtb Exp $
 
 DISTNAME=	cweb-3.62
 CATEGORIES=	devel lang
@@ -12,6 +12,8 @@ DEPENDS+= 	teTeX-[0-9]*:../../print/teTeX
 NO_WRKSUBDIR=	YES
 WRKSRC=		${WRKDIR}
 
+EVAL_PREFIX+=	PREFIX=teTeX
+
 post-patch:
 	@for f in ${WRKSRC}/cweb.1 ; do \
 	${SED} -e 's:%%PREFIX%%:'${PREFIX}':g' < $$f > $$f.tmp \
@@ -22,16 +24,14 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ctangle ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cweb.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/cwebmac.tex \
-		${PREFIX}/share/texmf/tex/plain/base
+	${PREFIX}/share/texmf/tex/plain/base
 	${INSTALL_DATA_DIR} ${PREFIX}/share/cweb
 	${INSTALL_DATA} ${WRKSRC}/c++lib.w ${PREFIX}/share/cweb
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cweb
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/cweb
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cweb
 	${INSTALL_DATA} ${WRKSRC}/cwebman.tex ${PREFIX}/share/doc/cweb
-.if !exists(${PREFIX}/share/emacs/site-lisp)
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
-.endif
 	${INSTALL_DATA} ${WRKSRC}/cweb.el ${PREFIX}/share/emacs/site-lisp
 
 post-install:
diff --git a/devel/cweb/pkg/INSTALL b/devel/cweb/pkg/INSTALL
deleted file mode 100644
index 675de46ddef..00000000000
--- a/devel/cweb/pkg/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-mktexlsr
diff --git a/devel/cweb/pkg/PLIST b/devel/cweb/pkg/PLIST
index 5620d525f41..689e49d17e8 100644
--- a/devel/cweb/pkg/PLIST
+++ b/devel/cweb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/25 17:23:27 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/13 22:27:12 jtb Exp $
 bin/ctangle
 bin/cweave
 man/man1/cweb.1
@@ -23,7 +23,8 @@ share/examples/cweb/xlib_types.w
 share/examples/cweb/xview_types.w
 share/texmf/tex/plain/base/cwebmac.tex
 @unexec mktexlsr
-@unexec rmdir share/emacs/site-lisp 2>/dev/null || true
+@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec rmdir %D/share/emacs 2>/dev/null || true
 @dirrm share/examples/cweb
 @dirrm share/doc/cweb
 @dirrm share/cweb
-- 
cgit v1.2.3