Let autosetup define PWD, do not unnecessarily try to create hcache dir (#847)

Issue #845

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 742da4210ec5d6c63fa73d939a4c741aa587554c..35000838a7db9ba1dfa0bf8167522abbee504ed9 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -4,6 +4,7 @@
 PACKAGE=       @PACKAGE@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 
+PWD=           @PWD@
 AR=            @AR@
 CC=            @CC@
 CPP=           @CPP@
@@ -245,8 +246,8 @@ hcache/hcversion.h: $(SRCDIR)/mutt.h $(SRCDIR)/address.h \
                        $(SRCDIR)/list.h $(SRCDIR)/lib/buffer.h \
                        $(SRCDIR)/parameter.h $(SRCDIR)/body.h \
                        $(SRCDIR)/envelope.h $(SRCDIR)/header.h \
-                       $(SRCDIR)/hcache/hcachever.sh
-       $(MKDIR_P) $(PWD)/hcache
+                       $(SRCDIR)/hcache/hcachever.sh \
+                       $(PWD)/hcache
        ( echo '#include "config.h"'; echo '#include "mutt.h"'; \
        echo '#include "address.h"'; echo '#include "list.h"'; \
        echo '#include "lib/buffer.h"'; echo '#include "parameter.h"'; \

diff --git a/auto.def b/auto.def
index 06da5eb1e85daf0221351258b06cd37fd2736b6e..6858211cb56bea76325c3f8f54ddf17ffda8c62c 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -851,6 +851,7 @@ foreach dir $subdirs {
 
 ###############################################################################
 # Generate Makefile and config.h
+define PWD [pwd]
 make-template Makefile.autosetup Makefile
 make-config-header config.h -auto $auto_rep -bare $bare_rep -str $str_rep