* Allow builds outside the source tree to succeed.
---
Makefile.in | 12 +++++++-----
base/macos-mcp.mak | 8 ++++----
base/macosx.mak | 8 ++++----
base/ugcclib.mak | 4 ++--
base/unix-gcc.mak | 8 ++++----
base/unixansi.mak | 8 ++++----
base/unixinst.mak | 10 +++++-----
7 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e5036ee..692ccc1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,17 +23,19 @@
# source, generated intermediate file, and object directories
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
+top_srcdir=@top_srcdir@
+
BINDIR=./$(BUILDDIRPREFIX)bin
-GLSRCDIR=./base
+GLSRCDIR=$(top_srcdir)/base
GLGENDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
GLOBJDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
AUXDIR=$(GLGENDIR)/aux@AUXDIRPOSTFIX@
-PSSRCDIR=./psi
-PSLIBDIR=./lib
-PSRESDIR=./Resource
+PSSRCDIR=$(top_srcdir)/psi
+PSLIBDIR=$(top_srcdir)/lib
+PSRESDIR=$(top_srcdir)/Resource
PSGENDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
PSOBJDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
-CONTRIBDIR=./contrib
+CONTRIBDIR=$(top_srcdir)/contrib
# Do not edit the next group of lines.
diff --git a/base/macos-mcp.mak b/base/macos-mcp.mak
index c9ecdb2..144db09 100644
--- a/base/macos-mcp.mak
+++ b/base/macos-mcp.mak
@@ -27,12 +27,12 @@
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
BINDIR=./bin
-GLSRCDIR=./base
+GLSRCDIR=$(top_srcdir)/base
GLGENDIR=./obj
GLOBJDIR=./obj
-PSSRCDIR=./psi
-PSLIBDIR=./lib
-PSRESDIR=./Resource
+PSSRCDIR=$(top_srcdir)/psi
+PSLIBDIR=$(top_srcdir)/lib
+PSRESDIR=$(top_srcdir)/Resource
PSGENDIR=./obj
PSOBJDIR=./obj
diff --git a/base/macosx.mak b/base/macosx.mak
index 88b0e6f..33bada5 100644
--- a/base/macosx.mak
+++ b/base/macosx.mak
@@ -23,13 +23,13 @@
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
BINDIR=./$(BUILDDIRPREFIX)bin
-GLSRCDIR=./base
+GLSRCDIR=$(top_srcdir)/base
GLGENDIR=./$(BUILDDIRPREFIX)obj
GLOBJDIR=./$(BUILDDIRPREFIX)obj
AUXDIR=$(GLGENDIR)/aux
-PSSRCDIR=./psi
-PSLIBDIR=./lib
-PSRESDIR=./Resource
+PSSRCDIR=$(top_srcdir)/psi
+PSLIBDIR=$(top_srcdir)/lib
+PSRESDIR=$(top_srcdir)/Resource
PSGENDIR=./$(BUILDDIRPREFIX)obj
PSOBJDIR=./$(BUILDDIRPREFIX)obj
diff --git a/base/ugcclib.mak b/base/ugcclib.mak
index e18debf..f76f8ff 100644
--- a/base/ugcclib.mak
+++ b/base/ugcclib.mak
@@ -15,10 +15,10 @@
# makefile for Unix / gcc library testing.
BINDIR=./libobj
-GLSRCDIR=./base
+GLSRCDIR=$(top_srcdir)/base
GLGENDIR=./libobj
GLOBJDIR=./libobj
-PSRESDIR=./Resource
+PSRESDIR=$(top_srcdir)/Resource
DD=$(GLGENDIR)/
GLD=$(GLGENDIR)/
diff --git a/base/unix-gcc.mak b/base/unix-gcc.mak
index d31affb..dc1d4c8 100644
--- a/base/unix-gcc.mak
+++ b/base/unix-gcc.mak
@@ -23,13 +23,13 @@
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
BINDIR=./$(BUILDDIRPREFIX)bin
-GLSRCDIR=./base
+GLSRCDIR=$(top_srcdir)/base
GLGENDIR=./$(BUILDDIRPREFIX)obj
GLOBJDIR=./$(BUILDDIRPREFIX)obj
AUXDIR=$(GLGENDIR)/aux
-PSSRCDIR=./psi
-PSLIBDIR=./lib
-PSRESDIR=./Resource
+PSSRCDIR=$(top_srcdir)/psi
+PSLIBDIR=$(top_srcdir)/lib
+PSRESDIR=$(top_srcdir)/Resource
PSGENDIR=./$(BUILDDIRPREFIX)obj
PSOBJDIR=./$(BUILDDIRPREFIX)obj
diff --git a/base/unixansi.mak b/base/unixansi.mak
index 41bd1ae..147db31 100644
--- a/base/unixansi.mak
+++ b/base/unixansi.mak
@@ -23,13 +23,13 @@
# for the graphics library (GL) and the PostScript/PDF interpreter (PS).
BINDIR=./$(BUILDDIRPREFIX)bin
-GLSRCDIR=./base
+GLSRCDIR=$(top_srcdir)/base
GLGENDIR=./$(BUILDDIRPREFIX)obj
GLOBJDIR=./$(BUILDDIRPREFIX)obj
AUXDIR=$(GLGENDIR)/aux
-PSSRCDIR=./psi
-PSLIBDIR=./lib
-PSRESDIR=./Resource
+PSSRCDIR=$(top_srcdir)/psi
+PSLIBDIR=$(top_srcdir)/lib
+PSRESDIR=$(top_srcdir)/Resource
PSGENDIR=./$(BUILDDIRPREFIX)obj
PSOBJDIR=./$(BUILDDIRPREFIX)obj
diff --git a/base/unixinst.mak b/base/unixinst.mak
index f8cf1b7..29c8dc7 100644
--- a/base/unixinst.mak
+++ b/base/unixinst.mak
@@ -49,11 +49,11 @@ wftopfa fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh
unix-lpr.sh ;\
fi;\
done'
-PSRESDIR=$(PSLIBDIR)/../Resource
-ICCRESDIR=$(PSLIBDIR)/../iccprofiles
-PSDOCDIR=$(PSLIBDIR)/../doc
-PSEXDIR=$(PSLIBDIR)/../examples
-PSMANDIR=$(PSLIBDIR)/../man
+PSRESDIR=$(top_srcdir)/Resource
+ICCRESDIR=$(top_srcdir)/iccprofiles
+PSDOCDIR=$(top_srcdir)/doc
+PSEXDIR=$(top_srcdir)/examples
+PSMANDIR=$(top_srcdir)/man
install-data: install-libdata install-resdata$(COMPILE_INITS)
install-iccdata$(COMPILE_INITS) install-doc install-man install-examples
--
1.7.10.4
