diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-24 15:15:47 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-24 15:15:47 -0700 |
| commit | 24e0f6b1dc721a919814b226834a4d027e9f90d0 (patch) | |
| tree | eb3edef13fd2275ab655eba6b83983b2e5513b0d /lib/makefile.w32-in | |
| parent | f25e39b45a5960f8f2bff6c43f88833bc04540a9 (diff) | |
| download | emacs-24e0f6b1dc721a919814b226834a4d027e9f90d0.tar.gz | |
Merge from gnulib, using build-aux to remove clutter.
* m4/largefile.m4: New file, so that Emacs does not mess up when
accessing files with large inode numbers in MacOS X 10.5 and later.
* m4/nocrash.m4: New file, to avoid triggering background debugger
and/or create core dumps during 'configure'.
* build-aux/move-if-change: Renamed from move-if-change.
* build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h.
* build-aux/snippet/c++defs.h: Renamed from c++defs.h.
* build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h.
* build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn.
* .bzrignore: The autogenerated files compile, config.guess,
config.sub, depcomp, install-sh, and missing are now in build-aux.
* Makefile.in (epaths-force, sync-from-gnulib):
move-if-change is now in build-aux.
(GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite
of gnulib's pthread_sigmask module, but Emacs doesn't need it.
(mkdir): install-sh is now in build-aux.
* config.bat: c++defs.h is now in build-aux/snippets.
* configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the
usual parameter).
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved
to build-aux/snippet.
* lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4:
* m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4:
Merge from gnuilib. This fixes porting bugs on Cygwin, Irix, and
Solaris, enables MacOS extensions, and enables nocrash during
'configure'.
* make-dist: Adjust to new build-aux and build-aux/snippit dirs.
* admin/notes/copyright: The files compile, config.guess, config.sub,
depcomp, install-sh, missing, and move-if-change are now in the
new build-aux subdirectory. The files arg-nonnull.h, c++defs.h,
and warn-on-use.h are now in build-aux/snippets. New file
build-aux/snippets/_Noreturn.h.
* leim/Makefile.in (install): install-sh is now in build-aux.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
to build-aux.
* msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
from top level to build-aux/snippet.
* src/Makefile.in (gl-stamp): move-if-change is now in build-aux.
Diffstat (limited to 'lib/makefile.w32-in')
| -rw-r--r-- | lib/makefile.w32-in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index df7f8e274f0..6b451dd14e1 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -213,7 +213,7 @@ INCLUDE_NEXT = include_next PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header PRAGMA_COLUMNS = NEXT_GETOPT_H = <getopt.h> -ARG_NONNULL_H = ../arg-nonnull.h +ARG_NONNULL_H = ../build-aux/snippet/arg-nonnull.h getopt_h: - $(DEL) getopt_.h-t getopt_.h |