Sat Mar 1 05:11:11 2008 UTC ()
Add EMACS_LISPPREFIX handling to PRINT_PLIST_AWK.


(obache)
diff -r1.48 -r1.49 pkgsrc/mk/emacs.mk
cvs diff -r1.48 -r1.49 pkgsrc/mk/Attic/emacs.mk (expand / switch to unified diff)

--- pkgsrc/mk/Attic/emacs.mk 2008/01/18 13:50:44 1.48
+++ pkgsrc/mk/Attic/emacs.mk 2008/03/01 05:11:10 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: emacs.mk,v 1.48 2008/01/18 13:50:44 obache Exp $ 1# $NetBSD: emacs.mk,v 1.49 2008/03/01 05:11:10 obache Exp $
2# 2#
3# This Makefile fragment handles Emacs Lisp Packages (== ELPs). 3# This Makefile fragment handles Emacs Lisp Packages (== ELPs).
4# 4#
5# Note to users: 5# Note to users:
6# 6#
7# * Users choose one favourite Emacs version (default GNU Emacs 21). 7# * Users choose one favourite Emacs version (default GNU Emacs 21).
8# 8#
9# * Emacs Lisp files are installed... 9# * Emacs Lisp files are installed...
10# GNU emacs 10# GNU emacs
11# -> ${PREFIX}/share/emacs/site-lisp/foo/... 11# -> ${PREFIX}/share/emacs/site-lisp/foo/...
12# XEmacs 12# XEmacs
13# ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/... 13# ->${PREFIX}/lib/xemacs/site-packages/lisp/foo/...
14# 14#
@@ -350,26 +350,30 @@ PLIST_SUBST+= FOR_${e}="@comment " NOTFO @@ -350,26 +350,30 @@ PLIST_SUBST+= FOR_${e}="@comment " NOTFO
350.endfor 350.endfor
351.if empty(EMACS_TYPE:M*nox) 351.if empty(EMACS_TYPE:M*nox)
352PLIST_SUBST+= FOR_emacs_x="" NOTFOR_emacs_nox="@comment " FOR_emacs_nox="@comment " NOTFOR_emacs_nox=""  352PLIST_SUBST+= FOR_emacs_x="" NOTFOR_emacs_nox="@comment " FOR_emacs_nox="@comment " NOTFOR_emacs_nox=""
353.else 353.else
354PLIST_SUBST+= FOR_emacs_x="@comment " NOTFOR_emacs_nox="" FOR_emacs_nox="" NOTFOR_emacs_nox="@comment "  354PLIST_SUBST+= FOR_emacs_x="@comment " NOTFOR_emacs_nox="" FOR_emacs_nox="" NOTFOR_emacs_nox="@comment "
355.endif 355.endif
356 356
357PLIST_SUBST+= EMACS_FLAVOR=${EMACS_FLAVOR:Q} 357PLIST_SUBST+= EMACS_FLAVOR=${EMACS_FLAVOR:Q}
358PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_NOREV:Q} 358PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_NOREV:Q}
359PLIST_SUBST+= EMACS_ETCPREFIX=${EMACS_ETCPREFIX:C|^${PREFIX}/||} 359PLIST_SUBST+= EMACS_ETCPREFIX=${EMACS_ETCPREFIX:C|^${PREFIX}/||}
360PLIST_SUBST+= EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||} 360PLIST_SUBST+= EMACS_INFOPREFIX=${EMACS_INFOPREFIX:C|^${PREFIX}/||}
361PLIST_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||} 361PLIST_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||}
362 362
 363PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \
 364 "$${EMACS_LISPPREFIX}"); \
 365 print; next; }
 366
363# 367#
364# ELP dependencies 368# ELP dependencies
365# 369#
366 370
367EMACS_MODULES?= # none 371EMACS_MODULES?= # none
368 372
369# "base" elisp modules 373# "base" elisp modules
370.if !empty(_EMACS_TYPE:Memacs*) 374.if !empty(_EMACS_TYPE:Memacs*)
371_EMACS_PKGDEP.${_EMACS_TYPE},base?= # empty 375_EMACS_PKGDEP.${_EMACS_TYPE},base?= # empty
372.elif !empty(_EMACS_TYPE:Mxemacs*) 376.elif !empty(_EMACS_TYPE:Mxemacs*)
373_EMACS_PKGDEP.${_EMACS_TYPE},base?= \ 377_EMACS_PKGDEP.${_EMACS_TYPE},base?= \
374 xemacs-packages>=1.15:../../editors/xemacs-packages 378 xemacs-packages>=1.15:../../editors/xemacs-packages
375.endif 379.endif