Re: New from emacs-snapshot
I write:
> # This shouldn't be needed as of 20.3
> -local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/leim
> +#local_lpath := ${local_lpath}:/usr/share/emacs/${runtime_ver}/leim
Actually, make that
# This shouldn't be needed as of 20.3
-local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/leim
+local_lpath := ${local_lpath}:/usr/share/emacs/${runtime_ver}/leim
It seems that is still needed after all. I can't enable any input
methods now after I compiled without that line.
So I'm compiling with this patch now (just that change):
--- orig/rules
+++ mod/rules
@@ -180,14 +180,14 @@
EMACS_GTK = $(CURDIR)/debian/${bin_name}-gtk
EMACS_EL = $(CURDIR)/debian/${bin_name}-el
-local_lpath := $(EMACS_COMMON)/etc/${bin_name}:$(EMACS_COMMON)/etc/emacs
-local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/local/share/emacs/${runtime_ver}/site-lisp
-local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/local/share/emacs/site-lisp
-local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/site-lisp
-local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/share/emacs/site-lisp
+local_lpath := /etc/${bin_name}:/etc/emacs
+local_lpath := ${local_lpath}:/usr/local/share/emacs/${runtime_ver}/site-lisp
+local_lpath := ${local_lpath}:/usr/local/share/emacs/site-lisp
+local_lpath := ${local_lpath}:/usr/share/emacs/${runtime_ver}/site-lisp
+local_lpath := ${local_lpath}:/usr/share/emacs/site-lisp
# This shouldn't be needed as of 20.3
-local_lpath := ${local_lpath}:$(EMACS_COMMON)/usr/share/emacs/${runtime_ver}/leim
+local_lpath := ${local_lpath}:/usr/share/emacs/${runtime_ver}/leim
# These files must always exist, i.e. can't ever be cleaned.
PERSISTENT_AUTOGEN_FILES := debian/control debian/copyright
@@ -418,7 +418,8 @@
${expand_file_subst_vars}
define build_cmd
- ${MAKE} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ ${MAKE} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ locallisppath=${local_lpath}
endef
emacs_inst = (${MAKE} install \
@@ -467,11 +468,13 @@
# Emacs must be boostraped at least once in order to
# generate .elc files
CFLAGS="${CFLAGS}" ./configure ${emacs_confflags}
+ ${build_cmd} epaths-force
${build_cmd} bootstrap
${build_cmd} distclean
# Build emacs
CFLAGS="${CFLAGS}" ./configure ${emacs_confflags}
+ ${build_cmd} epaths-force
${build_cmd}
# save binary from deletion
mv src/emacs src/x-emacs
@@ -479,6 +482,7 @@
# Build emacs-gtk
CFLAGS="${CFLAGS}" ./configure ${emacs_gtk_confflags}
+ ${build_cmd} epaths-force
time ${build_cmd}
# save binary from deletion
mv src/emacs src/gtk-emacs
@@ -486,6 +490,7 @@
# Build emacs-nox
CFLAGS="${CFLAGS}" ./configure ${emacs_nox_confflags}
+ ${build_cmd} epaths-force
time ${build_cmd}
# save binary from deletion
mv src/emacs src/nox-emacs
--
Daniel Brockman <daniel@brockman.se>
Reply to: