--- Makefile.in.orig	2012-01-03 13:29:36.000000000 -0600
+++ Makefile.in	2013-02-01 23:37:01.000000000 -0600
@@ -14,6 +14,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+mandir = @mandir@
 srcdir = @srcdir@
 
 INSTALL = /usr/bin/install -c
@@ -41,16 +42,16 @@
 #	$(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)${exec_prefix}/bin/pdftoppm$(EXE)
 	$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)${exec_prefix}/bin/pdfimages$(EXE)
 	$(INSTALL_PROGRAM) src/pdf2json$(EXE) $(DESTDIR)${exec_prefix}/bin/pdf2json$(EXE)
-	-mkdir -p $(DESTDIR)${prefix}/man/man1
-#	$(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)${prefix}/man/man1/xpdf.1
-	$(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)${prefix}/man/man1/pdftops.1
-	$(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)${prefix}/man/man1/pdftotext.1
-	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)${prefix}/man/man1/pdfinfo.1
-	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)${prefix}/man/man1/pdffonts.1
-#	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)${prefix}/man/man1/pdftoppm.1
-	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)${prefix}/man/man1/pdfimages.1
-	-mkdir -p $(DESTDIR)${prefix}/man/man5
-	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)${prefix}/man/man5/xpdfrc.5
+	-mkdir -p $(DESTDIR)${mandir}/man1
+#	$(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)${mandir}/man1/xpdf.1
+	$(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)${mandir}/man1/pdftops.1
+	$(INSTALL_DATA) $(srcdir)/doc/pdftotext.1 $(DESTDIR)${mandir}/man1/pdftotext.1
+	$(INSTALL_DATA) $(srcdir)/doc/pdfinfo.1 $(DESTDIR)${mandir}/man1/pdfinfo.1
+	$(INSTALL_DATA) $(srcdir)/doc/pdffonts.1 $(DESTDIR)${mandir}/man1/pdffonts.1
+#	$(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)${mandir}/man1/pdftoppm.1
+	$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)${mandir}/man1/pdfimages.1
+	-mkdir -p $(DESTDIR)${mandir}/man5
+	$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)${mandir}/man5/xpdfrc.5
 	-mkdir -p $(DESTDIR)${prefix}/etc
 	@if test ! -f $(DESTDIR)${prefix}/etc/xpdfrc; then \
 		echo "$(INSTALL_DATA) $(srcdir)/doc/sample-xpdfrc $(DESTDIR)${prefix}/etc/xpdfrc"; \
--- fofi/Makefile.in.orig	2012-01-01 21:45:26.000000000 -0600
+++ fofi/Makefile.in	2013-02-01 10:42:20.000000000 -0600
@@ -14,7 +14,7 @@
 GOOSRCDIR = $(srcdir)/../goo
 GOOLIBDIR = ../goo
 
-CXXFLAGS = -I/usr/local/include @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir)
+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(srcdir)
 
 CXX = @CXX@
 AR = ar rc
--- goo/Makefile.in.orig	2012-01-01 21:18:08.000000000 -0600
+++ goo/Makefile.in	2013-02-01 10:42:20.000000000 -0600
@@ -12,7 +12,7 @@
 VPATH = @srcdir@
 
 CFLAGS = @CFLAGS@ @DEFS@ -I.. -I$(srcdir)
-CXXFLAGS = -I/usr/local/include @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)
+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(srcdir)
 
 CC = @CC@
 CXX = @CXX@
--- splash/Makefile.in.orig	2012-01-01 22:04:49.000000000 -0600
+++ splash/Makefile.in	2013-02-01 23:30:10.000000000 -0600
@@ -16,8 +16,9 @@
 FOFISRCDIR = $(srcdir)/../fofi
 FOFILIBDIR = ../fofi
 
-CXXFLAGS = -I/usr/local/include @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir)
+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir)
 
+CXX = @CXX@
 AR = ar rc
 RANLIB = ranlib
 
--- src/Makefile.in.orig	2011-11-01 14:53:54.000000000 -0500
+++ src/Makefile.in	2013-02-01 23:28:01.000000000 -0600
@@ -11,14 +11,14 @@
 SPLASHSRCDIR = ../splash
 SPLASHLIBDIR = ../splash
 
-CXXFLAGS = -I/usr/local/include -g -O2 -DHAVE_CONFIG_H -DHAVE_DIRENT_H=1  -I.. -DHAVE_REWINDDIR=1 -DHAVE_POPEN=1 -I.. -I$(GOOSRCDIR) -I$(XPDFSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir)           -I/usr/X11R6/include
+CXXFLAGS = -g -O2 @CXXFLAGS@ -DHAVE_CONFIG_H -DHAVE_DIRENT_H=1  -I.. -DHAVE_REWINDDIR=1 -DHAVE_POPEN=1 -I.. -I$(GOOSRCDIR) -I$(XPDFSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir)           -I/usr/X11R6/include
 
-LDFLAGS = 
+LDFLAGS = @LDFLAGS@
 FTLIBS = 
 
 OTHERLIBS = 
 
-CXX ?= c++
+CXX = @CXX@
 
 LIBPREFIX = lib
 EXE = 
--- xpdf/Makefile.in.orig	2012-01-01 22:07:51.000000000 -0600
+++ xpdf/Makefile.in	2013-02-01 10:42:20.000000000 -0600
@@ -19,7 +19,7 @@
 SPLASHSRCDIR = $(srcdir)/../splash
 SPLASHLIBDIR = ../splash
 
-CXXFLAGS = -I/usr/local/include @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) 
+CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) 
 
 LDFLAGS = @LDFLAGS@