From f90a1828786c9ba4c9c7f66d6c355d7d765f1838 Mon Sep 17 00:00:00 2001
From: Kai Tetzlaff <kai.tetzlaff@web.de>
Date: Tue, 7 Aug 2012 09:20:45 +0200
Subject: [PATCH] update Makefile

---
 Makefile | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index ee1e48b..8806194 100644
--- a/Makefile
+++ b/Makefile
@@ -85,8 +85,7 @@ $(foreach d,$(CVS_DIRS),$(call eval-vcs-template,CVS_TMPL,$d))
 auctex/configure: auctex/autogen.sh auctex/configure.ac
 	cd $(@D) && ./autogen.sh
 
-auctex/Makefile: auctex/configure Makefile
-	$(MD) $(DOT_DIR)/share/texmf
+auctex/Makefile: auctex/configure Makefile | $(DOT_DIR)/share/texmf/.dir
 	cd $(@D) && ./configure\
     --infodir=$(INFO_DIR)\
     --datarootdir=$(DOT_DIR)/share\
@@ -206,13 +205,13 @@ org-mode:
 # emacs-jabber
 # #########################################################################
 .PHONY:	emacs-jabber
-$(ELISP_DIR)/emacs-jabber/configure : $(MAKEFILE_LIST)
+emacs-jabber/configure : $(MAKEFILE_LIST)
 	cd $(@D) && autoreconf -i
 
-$(ELISP_DIR)/emacs-jabber/Makefile: $(ELISP_DIR)/emacs-jabber/configure
+emacs-jabber/Makefile: emacs-jabber/configure
 	cd $(@D) && ./configure
 
-emacs-jabber: $(ELISP_DIR)/emacs-jabber/Makefile
+emacs-jabber: emacs-jabber/Makefile
 	$(MAKE) -C $(DIR-$@) install\
     EMACS="$(EMACS)"\
     prefix=$(DOT_DIR)\
@@ -225,24 +224,24 @@ emacs-jabber: $(ELISP_DIR)/emacs-jabber/Makefile
 # bbdb
 # #########################################################################
 .PHONY:	bbdb
-$(ELISP_DIR)/bbdb/configure : $(MAKEFILE_LIST)\
-  $(ELISP_DIR)/bbdb/configure.ac
-	cd $(ELISP_DIR)/bbdb && autoconf
+bbdb/configure : $(MAKEFILE_LIST)\
+  bbdb/configure.ac
+	cd $(@D) && autoconf
 
-$(ELISP_DIR)/bbdb/Makefile :\
-  $(ELISP_DIR)/bbdb/configure\
-  $(ELISP_DIR)/bbdb/Makefile.in\
-  $(ELISP_DIR)/bbdb/doc/Makefile.in\
-  $(ELISP_DIR)/bbdb/lisp/Makefile.in\
-  $(ELISP_DIR)/bbdb/tex/Makefile.in
-	$(MD) $(DOT_DIR)/share/texmf
+bbdb/Makefile :\
+  bbdb/configure\
+  bbdb/Makefile.in\
+  bbdb/doc/Makefile.in\
+  bbdb/lisp/Makefile.in\
+  bbdb/tex/Makefile.in\
+  | $(DOT_DIR)/share/texmf/.dir
 	cd $(@D) && ./configure\
-    --with-emacs="'$(EMACS)'"\
+    --with-emacs=$(call fixpath-shell,$(EMACS))\
     --datarootdir=$(DOT_DIR)\
     --with-lispdir=$(LISP_DIR)/bbdb\
     --with-texmf-dir=$(DOT_DIR)/share/texmf
 
-bbdb: $(ELISP_DIR)/bbdb/Makefile
+bbdb: bbdb/Makefile
 	$(MAKE) -C $(DIR-$@) install
 
 
@@ -250,10 +249,10 @@ bbdb: $(ELISP_DIR)/bbdb/Makefile
 # w3
 # #########################################################################
 .PHONY:	w3
-$(ELISP_DIR)/w3/Makefile : $(MAKEFILE_LIST)\
-  $(ELISP_DIR)/w3/configure
+w3/Makefile : $(MAKEFILE_LIST)\
+  w3/configure
 	cd $(@D) && ./configure\
-    --with-emacs="$(EMACS)"\
+    --with-emacs=$(call fixpath-shell,$(EMACS))\
     --prefix=$(DOT_DIR)\
     --with-lispdir=$(LISP_DIR)/w3\
     --libexecdir=$(LISP_DIR)/w3/bin\
@@ -261,7 +260,7 @@ $(ELISP_DIR)/w3/Makefile : $(MAKEFILE_LIST)\
     --infodir=$(INFO_DIR)\
     --with-gnus=$(ELISP_DIR)/gnus\
 
-w3: $(ELISP_DIR)/w3/Makefile
+w3: w3/Makefile
 	$(MAKE) -C $(DIR-$@) install