diff --git a/src/Makefile.in b/src/Makefile.in
index 46073efdc..729239d22 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -255,12 +255,11 @@ bare2.lsp:
 	cp $(srcdir)/util/gdbinit $@
 
 $(ECL_CMPDIR)/cmpdefs.lsp: $(ECL_CMPDIR)/cmpdefs.pre
-	sed -e 's,@ecldir\\@,"$(ecldir)",g' \
-	    -e 's,@libdir\\@,"$(libdir)",g' \
-	    -e 's,@includedir\\@,"$(includedir)",g' < $(ECL_CMPDIR)/cmpdefs.pre > $@
-compile.lsp: compile.pre
 	sed -e 's,@ecldir\\@,$(ecldir),g' \
-	    -e 's,@libdir\\@,$(libdir),g' < compile.pre > compile.lsp
+	    -e 's,@libdir\\@,$(libdir),g' \
+	    -e 's,@includedir\\@,$(includedir),g' < $(ECL_CMPDIR)/cmpdefs.pre > $@
+compile.lsp: compile.pre
+	sed -e 's,@ecldir\\@,$(ecldir),g' < compile.pre > compile.lsp
 bin/ecl-config: bin/ecl-config.pre
 	sed -e 's,@libdir\\@,$(libdir),' \
 	    -e 's,@includedir\\@,$(includedir),' \
diff --git a/src/cmp/cmpdefs.lsp b/src/cmp/cmpdefs.lsp
index 4a3974336..7926ed025 100644
--- a/src/cmp/cmpdefs.lsp
+++ b/src/cmp/cmpdefs.lsp
@@ -73,8 +73,9 @@ coprocessor).")
 (defvar +object-file-extension+ "@OBJEXT@")
 (defvar +executable-file-format+ "~a@EXEEXT@")
 
-(defvar *ecl-include-directory* @includedir\@)
-(defvar *ecl-library-directory* @libdir\@)
+(defvar *ecl-include-directory* "@includedir\@/")
+(defvar *ecl-library-directory* "@libdir\@/")
+(defvar *ecl-data-directory* "@ecldir\@/")
 
 (defvar *ld-rpath*
   (let ((x "@ECL_LDRPATH@"))