diff options
| author | minskim <minskim@pkgsrc.org> | 2006-04-12 17:58:41 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-04-12 17:58:41 +0000 |
| commit | 2c123a456c88dc98482cbceb753015d28730363f (patch) | |
| tree | 2b04c26459977031a89bbfe94c111f4d78862347 /print | |
| parent | d174a7ba44327a9c72cc25b1c318a5fe4af80a71 (diff) | |
| download | pkgsrc-2c123a456c88dc98482cbceb753015d28730363f.tar.gz | |
Fix PRINT_PLIST_AWK patterns to use "${PKG_LOCALTEXMFPREFIX}" instead of
its value. Noted by reed@.
Diffstat (limited to 'print')
| -rw-r--r-- | print/teTeX/module.mk | 4 | ||||
| -rw-r--r-- | print/texmf-dirs/dirs.mk | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/print/teTeX/module.mk b/print/teTeX/module.mk index 9d0710ed087..5207de583ea 100644 --- a/print/teTeX/module.mk +++ b/print/teTeX/module.mk @@ -1,4 +1,4 @@ -# $NetBSD: module.mk,v 1.13 2006/04/06 06:22:37 reed Exp $ +# $NetBSD: module.mk,v 1.14 2006/04/12 17:58:41 minskim Exp $ # # This Makefile fragment is intended to be included by packages that # install TeX packages. It takes care of rebuilding the ls-R database @@ -31,6 +31,8 @@ DEINSTALL_TEMPLATE+= ../../print/teTeX/files/texmf.tmpl PRINT_PLIST_AWK+= /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}(\/ls-R)?$$/ \ { next; } +PRINT_PLIST_AWK+= /^(@dirrm )?${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/ \ + { gsub(/${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, "$${PKG_LOCALTEXMFPREFIX}"); } # do not use tex.buildlink3.mk when the only accepted version is teTeX1 or teTeX2, to # allow bulk build to create packages diff --git a/print/texmf-dirs/dirs.mk b/print/texmf-dirs/dirs.mk index c40ab5013e7..7306a5a62d0 100644 --- a/print/texmf-dirs/dirs.mk +++ b/print/texmf-dirs/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.6 2006/04/12 17:03:27 minskim Exp $ +# $NetBSD: dirs.mk,v 1.7 2006/04/12 17:58:41 minskim Exp $ # # This file is intended to be included by mk/dirs.mk, not directly by packages. # @@ -45,8 +45,8 @@ TEXMF_DIRS+= web2c DEPENDS+= texmf-dirs>=${_USE_TEXMF_DIRS}:../../print/texmf-dirs . for dir in ${TEXMF_DIRS} -PRINT_PLIST_AWK+= /^@dirrm ${PKG_LOCALTEXMFPREFIX:S|${PREFIX}/||:S|/|\/|}\/${dir:S|/|\\/|g}$$/ \ - { print "@comment In texmf-dirs: " $$0; next; } +PRINT_PLIST_AWK+= /^@dirrm \$${PKG_LOCALTEXMFPREFIX}\/${dir:S|/|\\/|g}$$/ \ + { print "@comment In texmf-dirs: " $$0; next; } . endfor .endif |