Imported Upstream version 8.0pl3upstream/8.0pl3

1 files changed, 9 insertions, 8 deletions

diff --git a/config/Makefile.template b/config/Makefile.template
index cd49db89..e75b8bd0 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -24,25 +24,26 @@ LOCAL=LOCALINSTALLATION
 # LIBDIR=path where the Coq library will reside
 # MANDIR=path where to install manual pages
 # EMACSDIR=path where to put Coq's Emacs mode (coq.el)
-BINDIR="BINDIRDIRECTORY"
-COQLIB="COQLIBDIRECTORY"
-MANDIR="MANDIRDIRECTORY"
-EMACSLIB="EMACSLIBDIRECTORY"
+BINDIR='BINDIRDIRECTORY'
+COQLIB='COQLIBDIRECTORY'
+MANDIR='MANDIRDIRECTORY'
+EMACSLIB='EMACSLIBDIRECTORY'
 EMACS=EMACSCOMMAND
 
 # Path to Coq distribution
-COQTOP=COQTOPDIRECTORY
+COQTOP='COQTOPDIRECTORY'
 VERSION=COQVERSION
 
 # Directory containing Camlp4 binaries. Can be empty if camlp4 is in the PATH
-CAMLP4BIN=CAMLP4BINDIRECTORY
+CAMLP4BIN='CAMLP4BINDIRECTORY'
 
 # Ocaml version number
 CAMLVERSION=CAMLTAG
 
 # Camlp4 library directory (avoid CAMLP4LIB used on Windows)
 CAMLP4O=CAMLP4TOOL
-MYCAMLP4LIB=CAMLP4LIBDIRECTORY
+CAMLP4COMPAT=CAMLP4COMPATFLAGS
+MYCAMLP4LIB='CAMLP4LIBDIRECTORY'
 
 # Objective-Caml compile command 
 OCAMLC=BYTECAMLC
@@ -86,7 +87,7 @@ EXE=EXECUTEEXTENSION
 MKDIR=mkdir -p
 
 # where to put the coqdoc.sty style file
-COQDOCDIR=COQDOCDIRECTORY
+COQDOCDIR='COQDOCDIRECTORY'
 
 # command to update TeX' kpathsea database
 #MKTEXLSR=MKTEXLSRCOMMAND