|
 |
20edecd |
diff -up bbdb-2.35/lisp/Makefile.in.fix_lisp_makefile bbdb-2.35/lisp/Makefile.in
|
|
|
20edecd |
--- bbdb-2.35/lisp/Makefile.in.fix_lisp_makefile 2006-02-08 22:37:16.000000000 +0000
|
|
|
20edecd |
+++ bbdb-2.35/lisp/Makefile.in 2008-11-09 12:55:35.000000000 +0000
|
|
|
20edecd |
@@ -20,19 +20,14 @@ SYMLINKS = @SYMLINKS@
|
|
|
20edecd |
LINKPATH = @LINKPATH@
|
|
|
20edecd |
|
|
|
20edecd |
# this is lovely, isn't it? Surprisingly enough, it seems to work...
|
|
|
20edecd |
-VM = -eval '(progn (if (not (string-match "$(VMDIR)" "")) \
|
|
|
20edecd |
- (setq load-path (cons "$(VMDIR)" load-path))) \
|
|
|
20edecd |
- (if (load "vm-version" t t) \
|
|
|
20edecd |
- (cond ((> (string-to-number vm-version) 5.31) \
|
|
|
20edecd |
- (load "vm" t t)) \
|
|
|
20edecd |
- (t (load "vm-vars" t t) (load "vm" t t)))))'
|
|
|
20edecd |
-
|
|
|
20edecd |
-GNUS = -eval '(if (not (string-match "$(GNUSDIR)" "")) \
|
|
|
20edecd |
- (setq load-path (cons "$(GNUSDIR)" load-path)))'
|
|
|
20edecd |
-
|
|
|
20edecd |
-MHE = -eval '(progn (if (not (string-match "$(MHEDIR)" "")) \
|
|
|
20edecd |
- (setq load-path (cons "$(MHEDIR)" load-path))) \
|
|
|
20edecd |
- (load "mh-e" t t))'
|
|
|
20edecd |
+VM = -eval '(if (> (length "$(VMDIR)") 0) \
|
|
|
20edecd |
+ (setq load-path (cons "$(VMDIR)" load-path)))'
|
|
|
20edecd |
+
|
|
|
20edecd |
+GNUS = -eval '(if (> (length "$(GNUSDIR)") 0) \
|
|
|
20edecd |
+ (setq load-path (cons "$(GNUSDIR)" load-path)))'
|
|
|
20edecd |
+
|
|
|
20edecd |
+MHE = -eval '(if (> (length "$(MHEDIR)") 0) \
|
|
|
20edecd |
+ (setq load-path (cons "$(MHEDIR)" load-path)))'
|
|
|
20edecd |
|
|
|
20edecd |
PUSHPATH=-l @top_srcdir@/@BBDB_LOADPATH@
|
|
|
20edecd |
|
|
|
20edecd |
@@ -50,8 +45,7 @@ BINS= bbdb.elc $(DEPBINS)
|
|
|
20edecd |
all: Makefile @BBDB_RMAIL@ @BBDB_GNUS@ @BBDB_VM@ @BBDB_MHE@ bbdb autoloadsc
|
|
|
20edecd |
|
|
|
20edecd |
Makefile: Makefile.in
|
|
|
20edecd |
- @echo "Makefile.in has changed, rerun configure!"
|
|
|
20edecd |
- exit 1
|
|
|
20edecd |
+ cd ..; ./config.status
|
|
|
20edecd |
|
|
|
20edecd |
install-pkg: uninstall-pkg bbdb autoloadsc
|
|
|
20edecd |
@if test "x$(SYMLINKS)" = "xno" ; then \
|
|
|
20edecd |
@@ -143,10 +137,7 @@ bbdb-sc.elc: bbdb.elc bbdb-sc.el
|
|
|
20edecd |
|
|
|
20edecd |
bbdb-hooks.elc: bbdb.elc bbdb-hooks.el
|
|
|
20edecd |
@HUSHMAKE@$(EMACS_PROG) -batch -q $(PUSHPATH) -l ./bbdb.elc \
|
|
|
20edecd |
- -eval '(and (not (string= "$(VMDIR)" "")) \
|
|
|
20edecd |
- (setq load-path (cons "$(VMDIR)" load-path)) \
|
|
|
20edecd |
- (load "vm" t t) \
|
|
|
20edecd |
- (load "vm-vars" t t))' \
|
|
|
20edecd |
+ -eval '(and (not (string= "$(VMDIR)" "")) (setq load-path (cons "$(VMDIR)" load-path)) (load "vm" t t) (load "vm-vars" t t))' \
|
|
|
20edecd |
-f batch-byte-compile $(@:.elc=.el)
|
|
|
20edecd |
|
|
|
20edecd |
autoloads: bbdb-autoloads.el
|