From 402a7dcb2252a94609ce132c97d943cf40be65eb Mon Sep 17 00:00:00 2001
From: Kai Tetzlaff <kai.tetzlaff@web.de>
Date: Wed, 1 Aug 2012 09:01:44 +0200
Subject: [PATCH] fix recipes for auctex, reftex

---
 Makefile | 53 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 71b4fd3..fb0ba76 100644
--- a/Makefile
+++ b/Makefile
@@ -76,30 +76,33 @@ $(foreach d,$(CVS_DIRS),$(call eval-vcs-template,CVS_TMPL,$d))
 # auctex
 # #########################################################################
 .PHONY:	auctex
-auctex:
+auctex/configure: auctex/autogen.sh auctex/configure.ac
+	cd $(@D) && ./autogen.sh
+
+auctex/Makefile: auctex/configure Makefile
+	cd $(@D) && ./configure\
+    --infodir=$(INFO_DIR)\
+    --datarootdir=$(DOT_DIR)/var\
+    --localstatedir=$(DOT_DIR)/var\
+    --with-lispdir=$(LISP_DIR)\
+    --with-texmf-dir=$(DOT_DIR)/var/texmf\
+
+auctex: auctex/Makefile
 	$(MAKE) -C $(DIR-$@) clean
 	$(MAKE) -C $(DIR-$@) lisp info install\
-    EMACS=$(EMACS)\
-    auctexstartfile=$(LISP_DIR)/auctex.el\
-    previewstartfile=$(LISP_DIR)/preview-latex.el\
-    packagedatadir=$(LISP_DIR)/auctex\
-    packagelispdir=$(LISP_DIR)/auctex\
-    localstatedir=$(DOT_DIR)/var\
-    datarootdir=$(DOT_DIR)/var\
-    infodir=$(INFO_DIR)\
-    lispdir=$(LISP_DIR)\
+    EMACS="$(EMACS) --eval '(setq vc-handled-backends nil)'"
 
 
 # #########################################################################
 # reftex
 # #########################################################################
 .PHONY:	reftex
-reftex:
+cd reftex:
 	$(MAKE) -C $(DIR-$@) clean
 	$(MAKE) -C $(DIR-$@) lisp info install\
-    EMACS=$(EMACS)\
     infodir=$(INFO_DIR)\
     lispdir=$(LISP_DIR)/reftex\
+    EMACS="$(EMACS) --eval '(setq vc-handled-backends nil)'"
 
 
 # #########################################################################
@@ -109,11 +112,11 @@ reftex:
 ess:
 	-install-info --info-dir=$(INFO_DIR) --remove $(INFO_DIR)/ess.info
 	$(MAKE) -C $(DIR-$@) all install\
-    EMACS=$(EMACS)\
     PREFIX=$(DOT_DIR)\
     LISPDIR=$(LISP_DIR)/ess\
     ETCDIR=$(LISP_DIR)/ess/etc\
     INFODIR=$(INFO_DIR)\
+    EMACS="$(EMACS) --eval '(setq vc-handled-backends nil)'"
 
 
 # #########################################################################
@@ -139,29 +142,37 @@ doxymacs: doxymacs/Makefile $(wildcard doxymacs/lisp/*.el)
 # gnus
 # #########################################################################
 .PHONY:	gnus
+gnus/configure :| gnus/.git
 gnus/Makefile: gnus/configure
-	cd $(@D) && ./configure
+	cd $(@D) && ./configure\
+    --prefix=$(LISP_DIR)/gnus\
+    --infodir=$(INFO_DIR)\
 
 gnus: gnus/Makefile
 	$(MAKE) -C $(DIR-$@) clean
 	$(MAKE) -C $(DIR-$@) all\
     EMACS="$(EMACS) --eval '(setq vc-handled-backends nil)'"\
-    lispdir=$(LISP_DIR)/gnus\
-    infodir=$(INFO_DIR)\
 
 
 # #########################################################################
 # dvc
 # #########################################################################
 .PHONY:	dvc
-dvc:
+dvc/configure: dvc/configure.ac
+	cd $(@D) && autoreconf
+
+dvc/Makefile: dvc/configure Makefile
+	cd $(@D) && ./configure\
+    --prefix=$(LISP_DIR)/dvc\
+    --bindir=$(BIN_DIR)\
+    --infodir=$(INFO_DIR)\
+    --with-lispdir=$(LISP_DIR)/dvc\
+
+dvc: dvc/Makefile
 	-install-info --info-dir=$(INFO_DIR) --remove $(INFO_DIR)/dvc.info
 	$(MAKE) -C $(DIR-$@) clean
 	$(MAKE) -C $(DIR-$@) all install\
-    EMACS=$(EMACS)\
-    lispdir=$(LISP_DIR)/dvc\
-    info_dir=$(INFO_DIR)\
-    INSTALL=install
+    EMACS="$(EMACS) --eval '(setq vc-handled-backends nil)'"\
 
 
 # #########################################################################