summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-17 10:08:59 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-03-17 10:08:59 +0000
commite5163e8480cca4fcad35986f9999d921ce1ee568 (patch)
treec52aec227593ff84c8bdd134996438c7440ee7fd /Build
parentd584a6faa86c772504d4d39cc636c80663fc993a (diff)
xdvik: Use /usr/local/etc/mime.types (not mimetypes)
git-svn-id: svn://tug.org/texlive/trunk@25675 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL4
-rw-r--r--Build/source/texk/xdvik/mime.c2
-rw-r--r--Build/source/texk/xdvik/xdvi.1.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index 5c6f04aea6c..a8f9257122e 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2012-03-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mime.c, xdvi.1.in: Use /usr/local/etc/{mimetypes=>mime.types}.
+
2012-03-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* xdvi.1.in: Remove an unmatched #endif and formatting bugs.
diff --git a/Build/source/texk/xdvik/mime.c b/Build/source/texk/xdvik/mime.c
index fe16fa424d6..278a5fe10ad 100644
--- a/Build/source/texk/xdvik/mime.c
+++ b/Build/source/texk/xdvik/mime.c
@@ -54,7 +54,7 @@
/* default settings if $EXTENSIONMAPS and $MAILCAPS is not set */
static const char *const DEFAULT_EXTENSIONMAPS =
-"$HOME/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mimetypes";
+"$HOME/.mime.types:/etc/mime.types:/usr/etc/mime.types:/usr/local/etc/mime.types";
static const char *const DEFAULT_MAILCAPS =
"$HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap";
diff --git a/Build/source/texk/xdvik/xdvi.1.in b/Build/source/texk/xdvik/xdvi.1.in
index 94b98a6889a..536ca9c4dc4 100644
--- a/Build/source/texk/xdvik/xdvi.1.in
+++ b/Build/source/texk/xdvik/xdvi.1.in
@@ -3971,7 +3971,7 @@ If this variable is not set, the following default path is used:
.ft 3
.sp 1n
$HOME/.mime.types:/etc/mime.types:\e
- /usr/etc/mime.types:/usr/local/etc/mimetypes
+ /usr/etc/mime.types:/usr/local/etc/mime.types
.sp 1n
.ft
.fi