diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2003-11-05 11:58:43 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2003-11-05 11:58:43 +0000 |
| commit | 727294e81968a71c6bfaafb7054ddc97cfd41c53 (patch) | |
| tree | 6bcd52af0fdb9b148fec7be0ccd1b0ca9f1844bb /lib/emacs | |
| parent | 8cde79a28bf684560dbcb365e4eac6121ed90a7f (diff) | |
| download | autoconf-727294e81968a71c6bfaafb7054ddc97cfd41c53.tar.gz | |
* lib/autoconf/status.m4 (_AC_SRCPATHS): Fix use of AS_SET_CATFILE
so that ac_abs_builddir, ac_abs_top_builddir, ac_abs_srcdir,
and ac_abs_top_srcdir are absolute paths.
* lib/m4sugar/m4sh.m4 (AS_SET_CATFILE): Remove misleading comment.
Diffstat (limited to 'lib/emacs')
| -rw-r--r-- | lib/emacs/Makefile.in | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/emacs/Makefile.in b/lib/emacs/Makefile.in index f121108d..cb156e6b 100644 --- a/lib/emacs/Makefile.in +++ b/lib/emacs/Makefile.in @@ -36,7 +36,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = lib/emacs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__configure_deps = $(top_srcdir)/config/m4.m4 +am__aclocal_m4_deps = $(top_srcdir)/config/m4.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) DIST_COMMON = $(dist_lisp_LISP) $(srcdir)/Makefile.in Makefile.am mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = @@ -113,9 +116,9 @@ all: all-am .SUFFIXES: .SUFFIXES: .el .elc -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps) +$(srcdir)/Makefile.in: Makefile.am $(am__configure_deps) @for dep in $?; do \ - case '$(top_srcdir)/configure.ac $(ACLOCAL_M4) $(am__configure_deps)' in \ + case '$(am__configure_deps)' in \ *$$dep*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ && exit 0; \ @@ -137,9 +140,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(top_srcdir)/configure.ac $(am__configure_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: @@ -163,7 +166,7 @@ elc-stamp: $(am__ELFILES) else : ; fi install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) @$(NORMAL_INSTALL) - @if test -n "$(lispdir)"; then \ + @if test "$(EMACS)" != no; then \ $(mkinstalldirs) $(DESTDIR)$(lispdir); \ list='$(dist_lisp_LISP)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -179,7 +182,7 @@ install-dist_lispLISP: $(dist_lisp_LISP) $(ELCFILES) uninstall-dist_lispLISP: @$(NORMAL_UNINSTALL) - @if test -n "$(lispdir)"; then \ + @if test "$(EMACS)" != no; then \ list='$(dist_lisp_LISP)'; for p in $$list; do \ f="`echo $$p | sed -e 's|^.*/||'`"; \ echo " rm -f $(DESTDIR)$(lispdir)/$$f $(DESTDIR)$(lispdir)/$${f}c"; \ @@ -239,7 +242,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: |