From 542f63402b814a08867fbb52662e5513f2183dff Mon Sep 17 00:00:00 2001 From: Kai Tetzlaff Date: Tue, 7 Aug 2012 09:25:57 +0200 Subject: [PATCH] update mk --- emacsd-defs.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/emacsd-defs.mk b/emacsd-defs.mk index 58def02..0a1580e 100644 --- a/emacsd-defs.mk +++ b/emacsd-defs.mk @@ -3,7 +3,10 @@ ifndef HAS_UTIL_MK include $(HOME)/Documents/mk/util.mk endif -EMACS_OSX := $(wildcard $(HOME)/Work/oss/build/osx/clang/64/dbg/emacs-new/nextstep/Emacs.app/Contents/MacOS/Emacs) +EMACS_OSX := $(strip\ + $(or $(wildcard $(HOME)/Work/oss/emacs-mac-port/mac/Emacs.app/Contents/MacOS/Emacs),\ + $(wildcard $(HOME)/Work/oss/build/osx/clang/64/dbg/emacs-new/nextstep/Emacs.app/Contents/MacOS/Emacs))) + EMACS_W32 :=\ $(subst ?,$(sp),$(firstword\ $(subst $(sp),?,$(wildcard $(call fixpath-make,$(ProgramW6432)/emacs/bin/emacs.exe)))\