summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2013-09-23 14:09:15 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2013-09-23 14:09:15 +0200
commit38070381937a052cd8500fa64be2c9e575905edc (patch)
treeabd74b7139184985fd49e9ec41da8e064f723c11
parentee57f7fdae88c00b2d12b424fae2494b97ef4757 (diff)
downloadmpv-38070381937a052cd8500fa64be2c9e575905edc.tar.bz2
mpv-38070381937a052cd8500fa64be2c9e575905edc.tar.xz
install: don’t force append /mpv to docdir
-rw-r--r--Makefile6
-rwxr-xr-xconfigure4
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 927f2501a0..e00debdfbc 100644
--- a/Makefile
+++ b/Makefile
@@ -451,8 +451,8 @@ install-mpv-man-en: DOCS/man/en/mpv.1
install-mpv-pdf: install-mpv-pdf-en
install-mpv-pdf-en: DOCS/man/en/mpv.pdf
- if test ! -d $(DOCDIR)/mpv ; then $(INSTALL) -d $(DOCDIR)/mpv ; fi
- $(INSTALL) -m 644 DOCS/man/en/mpv.pdf $(DOCDIR)/mpv/
+ if test ! -d $(DOCDIR) ; then $(INSTALL) -d $(DOCDIR) ; fi
+ $(INSTALL) -m 644 DOCS/man/en/mpv.pdf $(DOCDIR)/
ICONSIZES = 16x16 32x32 64x64
@@ -476,7 +476,7 @@ uninstall:
$(RM) $(BINDIR)/mpv$(EXESUF)
$(RM) $(MANDIR)/man1/mpv.1
$(RM) $(MANDIR)/en/man1/mpv.1
- $(RM) $(DOCDIR)/mpv/mpv.pdf
+ $(RM) $(DOCDIR)/mpv.pdf
$(RM) $(prefix)/share/applications/mpv.desktop
$(RM) $(foreach size,$(ICONSIZES),$(prefix)/share/icons/hicolor/$(size)/apps/mpv.png)
diff --git a/configure b/configure
index 05f2f94031..8304d46fda 100755
--- a/configure
+++ b/configure
@@ -286,7 +286,7 @@ Installation directories:
--datadir=DIR directory for installing machine independent
data files (skins, etc) [PREFIX/share/mpv]
--mandir=DIR directory for installing man pages [PREFIX/share/man]
- --docdir=DIR directory for installing other docs [PREFIX/share/doc]
+ --docdir=DIR directory for installing docs [PREFIX/share/doc/mpv]
--confdir=DIR directory for installing configuration files
[PREFIX/etc/mpv]
--localedir=DIR directory for gettext locales [PREFIX/share/locale]
@@ -740,7 +740,7 @@ done
# Atmos: moved this here, to be correct, if --prefix is specified
test -z "$_bindir" && _bindir="$_prefix/bin"
test -z "$_mandir" && _mandir="$_prefix/share/man"
-test -z "$_docdir" && _docdir="$_prefix/share/doc"
+test -z "$_docdir" && _docdir="$_prefix/share/doc/mpv"
test -z "$_confdir" && _confdir="$_prefix/etc/mpv"
test -z "$_localedir" && _localedir="$_prefix/share/locale"