[gentoo-commits] gentoo-x86 commit in net-mail/notmuch/files: 0.9-fix-lib-makefile-local.patch 50notmuch-gentoo.el 0.9-emacsetcdir.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     11/11/02 15:30:50

  Added:                0.9-fix-lib-makefile-local.patch
                        50notmuch-gentoo.el 0.9-emacsetcdir.patch
  Log:
  Moved from app-text/notmuch to net-mail/notmuch.
  
  (Portage version: 2.1.10.31/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch?rev=1.1&content-type=text/plain

Index: 0.9-fix-lib-makefile-local.patch
===================================================================
From 42ba9b5456567686c77acbac716982e21a154172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Sun, 23 Oct 2011 16:24:36 +0200
Subject: [PATCH] Prefix lib/notmuch.h and lib/gen-version-script.sh with
 $(srcdir)

lib/notmuch.h and lib/gen-version-script.sh couldn't have been found
when building out of sources directory.
---
 lib/Makefile.local |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/Makefile.local b/lib/Makefile.local
index ea20b2b..be51eaa 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -41,6 +41,11 @@ endif
 dir := lib
 extra_cflags += -I$(srcdir)/$(dir) -fPIC
 
+# The (often-reused) $dir works fine within targets/prerequisites,
+# but cannot be used reliably within commands, so copy its value to a
+# variable that is not reused.
+lib := $(dir)
+
 libnotmuch_c_srcs =		\
 	$(notmuch_compat_srcs)	\
 	$(dir)/filenames.c	\
@@ -68,8 +73,8 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
 $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
 	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
 
-notmuch.sym: lib/notmuch.h $(libnotmuch_modules)
-	sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@
+notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
+	sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@
 
 $(dir)/$(SONAME): $(dir)/$(LIBNAME)
 	ln -sf $(LIBNAME) $@
@@ -79,10 +84,6 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME)
 
 install: install-$(dir)
 
-# The (often-reused) $dir works fine within targets/prerequisites,
-# but cannot be used reliably within commands, so copy its value to a
-# variable that is not reused.
-lib := $(dir)
 install-$(dir): $(dir)/$(LIBNAME)
 	mkdir -p "$(DESTDIR)$(libdir)/"
 	install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
-- 
1.7.7




1.1                  net-mail/notmuch/files/50notmuch-gentoo.el

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/50notmuch-gentoo.el?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/50notmuch-gentoo.el?rev=1.1&content-type=text/plain

Index: 50notmuch-gentoo.el
===================================================================
(add-to-list 'load-path "@SITELISP@")
(if (boundp 'image-load-path)
    (add-to-list 'image-load-path "@SITEETC@" t))
(autoload 'notmuch "notmuch" nil t)
(autoload 'notmuch-search "notmuch" nil t)
(autoload 'notmuch-hello "notmuch-hello" nil t)
(autoload 'notmuch-show "notmuch-show" nil t)



1.1                  net-mail/notmuch/files/0.9-emacsetcdir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.9-emacsetcdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/files/0.9-emacsetcdir.patch?rev=1.1&content-type=text/plain

Index: 0.9-emacsetcdir.patch
===================================================================
From 38375cefb708081eab7e7c928dcb85a1d68da6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name>
Date: Mon, 24 Oct 2011 20:26:27 +0200
Subject: [PATCH] Separate Emacs miscellaneous files directory from Emacs code
 directory.

--emacsetcdir was added, but it's set default to the same value as
--emacslispdir for backward compatibility.
---
 configure            |   14 ++++++++++++++
 emacs/Makefile.local |    3 ++-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 3999ce8..37c0283 100755
--- a/configure
+++ b/configure
@@ -97,6 +97,7 @@ Fine tuning of some installation directories is available:
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
 	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
+	--emacsetcdir=DIR	Emacs miscellaneous files [PREFIX/share/emacs/site-lisp]
 	--bashcompletiondir=DIR Bash completions files [SYSCONFDIR/bash_completion.d]
 	--zshcompletiondir=DIR	Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix]
 
@@ -139,6 +140,8 @@ for option; do
 	SYSCONFDIR="${option#*=}"
     elif [ "${option%%=*}" = '--emacslispdir' ] ; then
 	EMACSLISPDIR="${option#*=}"
+    elif [ "${option%%=*}" = '--emacsetcdir' ] ; then
+	EMACSETCDIR="${option#*=}"
     elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then
 	BASHCOMPLETIONDIR="${option#*=}"
     elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
@@ -330,6 +333,14 @@ if [ -z "${EMACSLISPDIR}" ]; then
     fi
 fi
 
+if [ -z "${EMACSETCDIR}" ]; then
+    if pkg-config --exists emacs; then
+	EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir)
+    else
+	EMACSETCDIR='$(prefix)/share/emacs/site-lisp'
+    fi
+fi
+
 printf "Checking if emacs is available... "
 if emacs --quick --batch > /dev/null 2>&1; then
     printf "Yes.\n"
@@ -614,6 +625,9 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
 # The directory to which emacs lisp files should be installed
 emacslispdir=${EMACSLISPDIR}
 
+# The directory to which emacs lisp files should be installed
+emacsetcdir=${EMACSETCDIR}
+
 # Whether there's an emacs binary available for byte-compiling
 HAVE_EMACS = ${have_emacs}
 
diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index ce0c3f0..0c58b82 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -38,6 +38,7 @@ install-emacs:
 ifeq ($(HAVE_EMACS),1)
 	install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
 endif
-	install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)"
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)
-- 
1.7.7.1