Re: New from emacs-snapshot
Jérôme Marant <jmarant@free.fr> writes:
> Daniel Brockman <daniel@brockman.se> writes:
>
>>> Hmm, Daniel, I looked into Makefiles and I didn't find any reason
>>> why it would be necessary. I think locallisppath is useless out
>>> of epaths-force and install.
>>
>> Yes, as far as I know we only need it for those two targets. I put it
>> there (i.e., in `build_cmd') because I figured it couldn't hurt and
>> that's how emacs21 did it.
>
> OK. I removed it and commited your changes. Feel free to comment, as
> usual :)
I'm afraid you removed it a little too well. These lines
${build_cmd} epaths-force
need to have locallisppath set (to the unprefixed directory names).
I arranged for that by adding the
locallisppath=${local_lpath}
parameter to the make invocation in `build_cmd', but you could do it
by changing all these lines
${build_cmd} epaths-force
to look like this:
${build_cmd} locallisppath=${local_lpath} epaths-force
As it is now, the package still fails to have the policy-mandated
directories inserted into `load-path' --- essentially, nothing
have changed.
So how about this?
--- orig/rules
+++ mod/rules
@@ -424,6 +424,10 @@
${MAKE} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
endef
+define epaths_force_cmd
+ ${build_cmd} locallisppath=${local_lpath} epaths-force
+endef
+
emacs_inst = (${MAKE} install \
INSTALL_STRIP="-s" \
prefix=${1}/usr \
@@ -470,13 +474,13 @@
# Emacs must be boostraped at least once in order to
# generate .elc files
CFLAGS="${CFLAGS}" ./configure ${emacs_confflags}
- ${build_cmd} epaths-force
+ ${epaths_force_cmd}
${build_cmd} bootstrap
${build_cmd} distclean
# Build emacs
CFLAGS="${CFLAGS}" ./configure ${emacs_confflags}
- ${build_cmd} epaths-force
+ ${epaths_force_cmd}
${build_cmd}
# save binary from deletion
mv src/emacs src/x-emacs
@@ -484,7 +488,7 @@
# Build emacs-gtk
CFLAGS="${CFLAGS}" ./configure ${emacs_gtk_confflags}
- ${build_cmd} epaths-force
+ ${epaths_force_cmd}
${build_cmd}
# save binary from deletion
mv src/emacs src/gtk-emacs
@@ -492,7 +496,7 @@
# Build emacs-nox
CFLAGS="${CFLAGS}" ./configure ${emacs_nox_confflags}
- ${build_cmd} epaths-force
+ ${epaths_force_cmd}
${build_cmd}
# save binary from deletion
mv src/emacs src/nox-emacs
Once your --enable-locallisppath goes in, we should be able to just
remove `epaths_force_cmd' (i.e., revert the above patch).
I'm currently rebuilding with this patch just to make sure it does
what I intend it to. I'll let you know the moment it's done.
--
Daniel Brockman <daniel@brockman.se>
Reply to: