70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
|
From 427fa24afbda44adafe96e74f1c7c350ca98dd73 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
|
||
|
|
Date: Wed, 29 Nov 2017 16:42:45 +0100
|
||
|
|
Subject: [PATCH] configure.ac: --without-versioned-path option introduced
|
||
|
|
|
||
|
|
Using this option will result in Ghostscript being installed into a
|
||
|
|
paths which do not contain its version in them, which can be useful
|
||
|
|
on some distributions.
|
||
|
|
|
||
|
|
As a result of using this option, the Ghostscript's search path will
|
||
|
|
be updated as well, to include correct files locations.
|
||
|
|
|
||
|
|
This option is disabled by default, and configure's help page states
|
||
|
|
that using this option is dangerous, risky and unsupported.
|
||
|
|
---
|
||
|
|
Makefile.in | 4 ++--
|
||
|
|
configure.ac | 21 +++++++++++++++++++++
|
||
|
|
2 files changed, 23 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index deed8e6..303a6b7 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -95,8 +95,8 @@ datadir = @datadir@
|
||
|
|
# The following must be substituted using @datadir@ and @libdir@
|
||
|
|
# to avoid adding RPM generation paths (CUPS STR #1112)
|
||
|
|
gsdir = @datadir@/ghostscript
|
||
|
|
-gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
|
||
|
|
-gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION)
|
||
|
|
+gsdatadir = $(gsdir)@VERSIONED_PATH@
|
||
|
|
+gssharedir = @libdir@/ghostscript@VERSIONED_PATH@
|
||
|
|
gsincludedir = @includedir@/ghostscript/
|
||
|
|
|
||
|
|
docdir=$(gsdatadir)/doc
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index d0f62d7..5baa9e8 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -2728,6 +2728,27 @@ fi
|
||
|
|
|
||
|
|
AC_SUBST(EXEEXT)
|
||
|
|
|
||
|
|
+# --------------------------------------------------
|
||
|
|
+# Check for disabling of versioned path option.
|
||
|
|
+# By default the versioned path must be enabled!
|
||
|
|
+# Using this option is user's own risk & responsibility.
|
||
|
|
+# --------------------------------------------------
|
||
|
|
+AC_ARG_WITH([versioned-path],
|
||
|
|
+[ --without-versioned-path
|
||
|
|
+ Do not use file paths containing the version of GS.
|
||
|
|
+
|
||
|
|
+ WARNING: This option is dangerous & unsupported, and
|
||
|
|
+ you take full responsibility for using it!],
|
||
|
|
+versioned_path=no)
|
||
|
|
+
|
||
|
|
+if test "x$versioned_path" != "xno"; then
|
||
|
|
+ VERSIONED_PATH='/$(GS_DOT_VERSION)'
|
||
|
|
+else
|
||
|
|
+ VERSIONED_PATH=''
|
||
|
|
+fi
|
||
|
|
+
|
||
|
|
+AC_SUBST(VERSIONED_PATH)
|
||
|
|
+
|
||
|
|
|
||
|
|
if test x"$CCAUX" != x"$CC"; then
|
||
|
|
|
||
|
|
--
|
||
|
|
2.9.5
|
||
|
|
|