Mercurial > mxe-octave
changeset 4055:ccade212c3f9
ghostscript: set ghostscript search paths based on mxe install path (Bug #46301)
* src/ghostscript-mingw-i686-makefile: update GS_LIB_DEFAULT, GS_DOC_DIR paths
* src/ghostscript-mingw-x86_64-makefile: update GS_LIB_DEFAULT, GS_DOC_DIR paths
* src/ghostscript.mk: use ENABLE_WINDOWS_64 flag to set whether to compile mingw 32 or 64
author | John Donoghue |
---|---|
date | Mon, 02 Nov 2015 17:30:00 -0500 |
parents | f6cee5e12b55 |
children | 54318919b60c |
files | src/ghostscript-mingw-i686-makefile src/ghostscript-mingw-x86_64-makefile src/ghostscript.mk |
diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ghostscript-mingw-i686-makefile Sun Oct 25 20:12:45 2015 -0400 +++ b/src/ghostscript-mingw-i686-makefile Mon Nov 02 17:30:00 2015 -0500 @@ -78,7 +78,7 @@ docdir=$(gsdatadir)/doc exdir=$(gsdatadir)/examples -GS_DOCDIR=$(docdir) +GS_DOCDIR=/usr/share/ghostscript/$(GS_DOT_VERSION)/doc # Choose whether to compile the .ps initialization files into the executable. # See gs.mak for details. @@ -88,7 +88,7 @@ # Define the default directory/ies for the runtime # initialization and font files. Separate multiple directories with a :. -GS_LIB_DEFAULT=$(gsdatadir)/Resource/Init:$(gsdatadir)/lib:$(gsdatadir)/Resource/Font:$(gsdir)/fonts:${datarootdir}/fonts/default/ghostscript:${datarootdir}/fonts/default/Type1:${datarootdir}/fonts/default/TrueType:/usr/lib/DPS/outline/base:/usr/openwin/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/TrueType +GS_LIB_DEFAULT=/usr/share/ghostscript/$(GS_DOT_VERSION)/Resource/Init:/usr/share/ghostscript/$(GS_DOT_VERSION)/lib:/usr/share/ghostscript/$(GS_DOT_VERSION)/Resource/Font:/usr/share/ghostscript/fonts:/usr/share/fonts/default/ghostscript:/usr/share/fonts/default/Type1:/usr/share/fonts/default/TrueType:/usr/lib/DPS/outline/base # Define the default directory for cached data files # this must be a single path.
--- a/src/ghostscript-mingw-x86_64-makefile Sun Oct 25 20:12:45 2015 -0400 +++ b/src/ghostscript-mingw-x86_64-makefile Mon Nov 02 17:30:00 2015 -0500 @@ -78,7 +78,7 @@ docdir=$(gsdatadir)/doc exdir=$(gsdatadir)/examples -GS_DOCDIR=$(docdir) +GS_DOCDIR=/usr/share/ghostscript/$(GS_DOT_VERSION)/doc # Choose whether to compile the .ps initialization files into the executable. # See gs.mak for details. @@ -88,7 +88,7 @@ # Define the default directory/ies for the runtime # initialization and font files. Separate multiple directories with a :. -GS_LIB_DEFAULT=$(gsdatadir)/Resource/Init:$(gsdatadir)/lib:$(gsdatadir)/Resource/Font:$(gsdir)/fonts:${datarootdir}/fonts/default/ghostscript:${datarootdir}/fonts/default/Type1:${datarootdir}/fonts/default/TrueType:/usr/lib/DPS/outline/base:/usr/openwin/lib/X11/fonts/Type1:/usr/openwin/lib/X11/fonts/TrueType +GS_LIB_DEFAULT=/usr/share/ghostscript/$(GS_DOT_VERSION)/Resource/Init:/usr/share/ghostscript/$(GS_DOT_VERSION)/lib:/usr/share/ghostscript/$(GS_DOT_VERSION)/Resource/Font:/usr/share/ghostscript/fonts:/usr/share/fonts/default/ghostscript:/usr/share/fonts/default/Type1:/usr/share/fonts/default/TrueType:/usr/lib/DPS/outline/base # Define the default directory for cached data files # this must be a single path.
--- a/src/ghostscript.mk Sun Oct 25 20:12:45 2015 -0400 +++ b/src/ghostscript.mk Mon Nov 02 17:30:00 2015 -0500 @@ -56,7 +56,7 @@ ## probe the build system and don't know about cross compiling, ## so we generate the files then replace them with files from a ## mingw native build. - ifeq ($(ENABLE_64),yes) + ifeq ($(ENABLE_WINDOWS_64),yes) define $(PKG)_BUILD mv '$(1)/freetype' '$(1)/freetype.x' cp '$(TOP_DIR)/src/ghostscript-mingw-x86_64-makefile' '$(1)/Makefile'