summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/kpathsea/texmf.mk12
-rw-r--r--print/texlive/package.mk11
2 files changed, 12 insertions, 11 deletions
diff --git a/print/kpathsea/texmf.mk b/print/kpathsea/texmf.mk
index a652b157a73..5dbc85e7fbb 100644
--- a/print/kpathsea/texmf.mk
+++ b/print/kpathsea/texmf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texmf.mk,v 1.3 2010/01/29 04:10:14 minskim Exp $
+# $NetBSD: texmf.mk,v 1.4 2011/11/30 19:15:46 minskim Exp $
#
# This Makefile fragment is intended to be included by packages that
# install TeX packages. It rebuilds the ls-R databases at
@@ -32,4 +32,14 @@ INSTALL_TEMPLATES+= ../../print/kpathsea/files/config-install.tmpl
DEINSTALL_TEMPLATES+= ../../print/kpathsea/files/config-deinstall.tmpl
. endif
+.if !empty(TEX_FORMATS) || !empty(TEX_FORMAT_NAMES)
+. include "../../print/texlive-tetex/format.mk"
+.endif
+.if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF)
+. include "../../print/texlive-tetex/hyphen.mk"
+.endif
+.if !empty(TEX_MAP_FILES) || !empty(TEX_MIXEDMAP_FILES)
+. include "../../print/tex-tetex/map.mk"
+.endif
+
.endif # TEX_TEXMF_MK
diff --git a/print/texlive/package.mk b/print/texlive/package.mk
index 2ba6ff0c805..e035f922b0d 100644
--- a/print/texlive/package.mk
+++ b/print/texlive/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.11 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: package.mk,v 1.12 2011/11/30 19:15:46 minskim Exp $
#
# This Makefile fragment is intended to be included by packages that build
# TeX Live packages.
@@ -134,15 +134,6 @@ _texlive-install:
.if empty(TEX_TEXMF_DIRS) || ${TEX_TEXMF_DIRS} != "none"
. include "../../print/kpathsea/texmf.mk"
.endif
-.if !empty(TEX_FORMATS) || !empty(TEX_FORMAT_NAMES)
-. include "../../print/texlive-tetex/format.mk"
-.endif
-.if !empty(TEX_HYPHEN_DAT) || !empty(TEX_HYPHEN_DEF)
-. include "../../print/texlive-tetex/hyphen.mk"
-.endif
-.if !empty(TEX_MAP_FILES) || !empty(TEX_MIXEDMAP_FILES)
-. include "../../print/tex-tetex/map.mk"
-.endif
post-extract: _texlive-set-permission _texlive-info _texlive-man
do-install: _texlive-install