71 lines
2.4 KiB
Diff
71 lines
2.4 KiB
Diff
|
From 3bbbbbfbaf543e47cbddf6a1932d84b10e26a082 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
|
||
|
|
Date: Mon, 11 Dec 2017 19:11:04 +0100
|
||
|
|
Subject: [PATCH] Makefile.in: enable --docdir= parameter to be working
|
||
|
|
|
||
|
|
Previously, the Ghostscript was using custom path to the documentation
|
||
|
|
(as docdir=$(gsdatadir)/doc). This was causing that value of --docdir=
|
||
|
|
parameter of ./configure was accepted, but not used at all.
|
||
|
|
|
||
|
|
This commit fixes this issue, by using docdir=@docdir@@VERSIONED_PATH@
|
||
|
|
instead. However, as a side effect this results in default path for
|
||
|
|
documentation to changed to this (with --prefix=/usr):
|
||
|
|
|
||
|
|
/usr/share/doc/ghostscript/<version>/
|
||
|
|
|
||
|
|
To stay backward compatible, a symlink is automatically created to
|
||
|
|
point from the old location (/usr/share/ghostscript/<version>/doc) to
|
||
|
|
the new location.
|
||
|
|
|
||
|
|
NOTE: Trying to fix this issue with the location of documentation
|
||
|
|
staying as it was would require some hacking inside the Autoconf
|
||
|
|
itself, which is not desirable.
|
||
|
|
---
|
||
|
|
Makefile.in | 3 ++-
|
||
|
|
base/unixinst.mak | 1 +
|
||
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index a554b42..ebf64d8 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -23,6 +23,7 @@
|
||
|
|
# source, generated intermediate file, and object directories
|
||
|
|
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
|
||
|
|
|
||
|
|
+PACKAGE=ghostscript
|
||
|
|
BINDIR=./$(BUILDDIRPREFIX)bin
|
||
|
|
GLSRCDIR=@srcdir@/base
|
||
|
|
DEVSRCDIR=@srcdir@/devices
|
||
|
|
@@ -91,6 +92,7 @@ mandir = @mandir@
|
||
|
|
man1ext = 1
|
||
|
|
man1dir = $(mandir)/man$(man1ext)
|
||
|
|
datadir = @datadir@
|
||
|
|
+docdir = @docdir@@VERSIONED_PATH@
|
||
|
|
|
||
|
|
# The following must be substituted using @datadir@ and @libdir@
|
||
|
|
# to avoid adding RPM generation paths (CUPS STR #1112)
|
||
|
|
@@ -99,7 +101,6 @@ gsdatadir = $(gsdir)@VERSIONED_PATH@
|
||
|
|
gssharedir = @libdir@/ghostscript@VERSIONED_PATH@
|
||
|
|
gsincludedir = @includedir@/ghostscript/
|
||
|
|
|
||
|
|
-docdir=$(gsdatadir)/doc
|
||
|
|
exdir=$(gsdatadir)/examples
|
||
|
|
GS_DOCDIR=$(docdir)
|
||
|
|
|
||
|
|
diff --git a/base/unixinst.mak b/base/unixinst.mak
|
||
|
|
index 296e9fa..5977396 100644
|
||
|
|
--- a/base/unixinst.mak
|
||
|
|
+++ b/base/unixinst.mak
|
||
|
|
@@ -163,6 +163,7 @@ install-doc: $(PSDOCDIR)/News.htm
|
||
|
|
$(SH) -c 'for f in $(DOC_PAGES) ;\
|
||
|
|
do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\
|
||
|
|
done'
|
||
|
|
+ ln -s $(docdir) $(DESTDIR)$(gsdatadir)/doc
|
||
|
|
|
||
|
|
# install the man pages for each locale
|
||
|
|
MAN_LCDIRS=. de
|
||
|
|
--
|
||
|
|
2.9.5
|
||
|
|
|