Commit cee4acda authored by Glenn Morris's avatar Glenn Morris

Fix previous Makefile change.

* configure.in (OPT_MAKEFILES_IN): Use full path.
* Makefile.in (SUBDIR_MAKEFILES_IN): Use full path.
(SUBDIR_MAKEFILES): Use relative path.
parent a877df06
......@@ -268,12 +268,19 @@ SUBDIR = lib lib-src src lisp
OPT_MAKEFILES_IN = @OPT_MAKEFILES_IN@
# The subdir makefiles created by config.status.
SUBDIR_MAKEFILES_IN = lib/Makefile.in lib-src/Makefile.in \
doc/emacs/Makefile.in doc/misc/Makefile.in doc/lispref/Makefile.in \
doc/lispintro/Makefile.in src/Makefile.in oldXMenu/Makefile.in \
lwlib/Makefile.in leim/Makefile.in lisp/Makefile.in $(OPT_MAKEFILES_IN)
SUBDIR_MAKEFILES = $(SUBDIR_MAKEFILES_IN:.in=)
SUBDIR_MAKEFILES_IN = $(srcdir)/lib/Makefile.in \
$(srcdir)/lib-src/Makefile.in \
$(srcdir)/doc/emacs/Makefile.in \
$(srcdir)/doc/misc/Makefile.in \
$(srcdir)/doc/lispref/Makefile.in \
$(srcdir)/doc/lispintro/Makefile.in \
$(srcdir)/src/Makefile.in \
$(srcdir)/oldXMenu/Makefile.in \
$(srcdir)/lwlib/Makefile.in \
$(srcdir)/leim/Makefile.in \
$(srcdir)/lisp/Makefile.in $(OPT_MAKEFILES_IN)
SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
......
......@@ -3719,7 +3719,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
dnl test/ is not present in release tarfiles.
if test -f $srcdir/test/automated/Makefile.in; then
OPT_MAKEFILES_IN=test/automated/Makefile.in
OPT_MAKEFILES_IN="\$(srcdir)/test/automated/Makefile.in"
AC_CONFIG_FILES([test/automated/Makefile])
else
OPT_MAKEFILES_IN=
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment