diff -up ocp-0.1.20/doc/texi/Makefile.docdir ocp-0.1.20/doc/texi/Makefile
--- ocp-0.1.20/doc/texi/Makefile.docdir 2010-05-17 05:55:16.000000000 -0400
+++ ocp-0.1.20/doc/texi/Makefile 2013-08-06 18:04:28.506454302 -0400
@@ -19,12 +19,12 @@ install: all
mkdir -p "$(DESTDIR)$(INFODIR)"
$(CP) ocp.info.gz "$(DESTDIR)$(INFODIR)"
install-info --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz" || true
- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
- $(CP) -R ocp.html/* "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
+ mkdir -p "$(DESTDIR)$(DOCDIR)/html"
+ $(CP) -R ocp.html/* "$(DESTDIR)$(DOCDIR)/html"
uninstall:
install-info --delete --dir-file="$(DESTDIR)$(INFODIR)/dir" "$(DESTDIR)$(INFODIR)/ocp.info.gz"
rm -f "$(DESTDIR)$(INFODIR)/ocp.info.gz"
- rm -Rf "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)/html"
+ rm -Rf "$(DESTDIR)$(DOCDIR)/html"
else
all:
diff -up ocp-0.1.20/Makefile.in.docdir ocp-0.1.20/Makefile.in
--- ocp-0.1.20/Makefile.in.docdir 2010-05-17 05:55:17.000000000 -0400
+++ ocp-0.1.20/Makefile.in 2013-08-06 18:00:54.994677835 -0400
@@ -35,8 +35,8 @@ endif
install: all
- mkdir -p "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
- $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)"
+ mkdir -p "$(DESTDIR)$(DOCDIR)"
+ $(CP) AUTHORS BUGS COPYING CREDITS KEYBOARD_REMAPS SUID TODO "$(DESTDIR)$(DOCDIR)"
mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
$(CP) ocp.hlp "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/data"
mkdir -p "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)/etc"
@@ -131,7 +131,7 @@ endif
$(MAKE) -C stuff TOPDIR=../$(TOPDIR) uninstall
$(MAKE) -C medialib TOPDIR=../$(TOPDIR) uninstall
$(MAKE) -C doc TOPDIR="../$(TOPDIR)" uninstall
- rm -Rf "$(DESTDIR)$(PREFIX)/share/doc/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp" "$(DESTDIR)$(BINDIR)/ocp-curses" "$(DESTDIR)$(BINDIR)/ocp-sdl" "$(DESTDIR)$(BINDIR)/ocp-vcsa" "$(DESTDIR)$(BINDIR)/ocp-x11" "$(DESTDIR)$(BINDIR)/ultrafix.sh"
+ rm -Rf "$(DESTDIR)$(DOCDIR)" "$(DESTDIR)$(PREFIX)/share/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp" "$(DESTDIR)$(BINDIR)/ocp-curses" "$(DESTDIR)$(BINDIR)/ocp-sdl" "$(DESTDIR)$(BINDIR)/ocp-vcsa" "$(DESTDIR)$(BINDIR)/ocp-x11" "$(DESTDIR)$(BINDIR)/ultrafix.sh"
rm -f "$(DESTDIR)$(PREFIX)/share/applications/opencubicplayer.desktop" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/opencubicplayer.xpm" "$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/opencubicplayer.xpm"
dirs:
diff -up ocp-0.1.20/Rules.make.in.docdir ocp-0.1.20/Rules.make.in
--- ocp-0.1.20/Rules.make.in.docdir 2010-05-17 05:55:16.000000000 -0400
+++ ocp-0.1.20/Rules.make.in 2013-08-06 18:00:54.994677835 -0400
@@ -4,6 +4,7 @@ PREFIX=@PREFIX@
LIBDIR=@LIBDIR@
INFODIR=@INFODIR@
BINDIR=@BINDIR@
+DOCDIR=@docdir@
SYSCONFDIR=@SYSCONFDIR@
DESKTOP_FILE_INSTALL=@DESKTOP_FILE_INSTALL@