diff --git a/Makefile b/Makefile
index 74418a3..2c03e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -245,11 +245,11 @@ bbdb/Makefile :\
   bbdb/tex/Makefile.in\
   | $(DOT_DIR)/share/texmf/.dir
 	cd $(@D) && ./configure\
-    --with-emacs=$(call fixpath-shell,$(EMACS))\
+    EMACS=$(call fixpath-shell,$(EMACS))\
+    --prefix=$(DOT_DIR)\
     --datarootdir=$(DOT_DIR)\
+    --datadir=$(DOT_DIR)/share/texmf\
     --with-lispdir=$(LISP_DIR)/bbdb\
-    --with-tex-dir=$(DOT_DIR)/share/texmf\
-    --with-texmf-dir=$(DOT_DIR)/share/texmf
 
 bbdb: bbdb/Makefile
 	$(MAKE) -C $(DIR-$@) install