procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Makefile.in (epaths-force-w32): Move srcdir tweak here

Browse source 
* configure.ac (abs_srcdir) [MINGW32]: No point setting it here,
config.status computes it.
This commit is contained in:
Glenn Morris 2013-11-05 16:51:09 -05:00
parent 02fc973bc9
commit c923b188f4
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2013-11-05 Glenn Morris <rgm@gnu.org>
* configure.ac (abs_srcdir) [MINGW32]: No point setting it here,
config.status computes it.
* Makefile.in (epaths-force-w32): Move srcdir tweak here.
* autogen: Remove directory. Move update_autogen to admin/.
* autogen.sh: Remove reference to copy_autogen.
* GNUmakefile (configure):

10
Makefile.in
View file

@ -342,8 +342,16 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
# nt/epaths.nt as the template.
# Use the value of ${locallisppath} supplied by `configure',
# to support the --enable-locallisppath argument.
#
# When building with MinGW inside the MSYS tree, 'pwd' produces directories
# relative to the root of the MSYS tree, e.g. '/home/user/foo' instead of
# '/d/MSYS/home/user/foo'. If such a value of srcdir is written to
# src/epaths.h, that causes temacs to fail, because, being a MinGW
# program that knows nothing of MSYS root substitution, it cannot find
# the data directory. "pwd -W" produces Windows-style 'd:/foo/bar'
# absolute directory names, so we use it here to countermand that lossage.
epaths-force-w32: FRC
@(w32srcdir=`echo "${abs_srcdir}" | ${msys_to_w32}` ; \
@(w32srcdir=`cd "${srcdir}"; pwd -W | sed -e 's,^\([A-Za-z]\):,/\1,' | ${msys_to_w32}` ; \
prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \
locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \
sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \

11
configure.ac
View file

@ -419,17 +419,6 @@ AC_ARG_ENABLE(gtk-deprecation-warnings,
[Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])],
[ac_enable_gtk_deprecation_warnings="${enableval}"],[])
#### When building with MinGW inside the MSYS tree, 'pwd' produces
#### directories relative to the root of the MSYS tree,
#### e.g. '/home/user/foo' instead of '/d/MSYS/home/user/foo'. When
#### such a value of srcdir is written to the top-level Makefile, it
#### gets propagated to src/epaths.h, and that causes temacs to fail,
#### because, being a MinGW program that knows nothing of MSYS root
#### substitution, it cannot find the data directory. "pwd -W"
#### produces Windows-style 'd:/foo/bar' absolute directory names, so
#### we use it here to countermand that lossage.
test "$MSYSTEM" = "MINGW32" && abs_srcdir=`(cd "$abs_srcdir"; pwd -W | sed -e 's,^\([[A-Za-z]]\):,/\1,')`
### Canonicalize the configuration name.
AC_CANONICAL_HOST