diff options
| author | Paul Eggert | 2017-05-30 09:15:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-05-30 09:16:28 -0700 |
| commit | ebcc70ab1be968a9d98eaa7cf6a51421ff8ea62f (patch) | |
| tree | cfe1d8550be03f2fc9e630ac58dafef1aaf24162 /lib | |
| parent | 412c38aa28dd7e8363b481a09d1df62c40f9a5b7 (diff) | |
| download | emacs-ebcc70ab1be968a9d98eaa7cf6a51421ff8ea62f.tar.gz emacs-ebcc70ab1be968a9d98eaa7cf6a51421ff8ea62f.zip | |
Merge from gnulib
* build-aux/config.guess: Copy from gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnulib.mk.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 6d85dc59585..d23c2a57ec3 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in | |||
| @@ -645,6 +645,8 @@ NS_OBJ = @NS_OBJ@ | |||
| 645 | NS_OBJC_OBJ = @NS_OBJC_OBJ@ | 645 | NS_OBJC_OBJ = @NS_OBJC_OBJ@ |
| 646 | NTDIR = @NTDIR@ | 646 | NTDIR = @NTDIR@ |
| 647 | NTLIB = @NTLIB@ | 647 | NTLIB = @NTLIB@ |
| 648 | OBJC = @OBJC@ | ||
| 649 | OBJCFLAGS = @OBJCFLAGS@ | ||
| 648 | OBJEXT = @OBJEXT@ | 650 | OBJEXT = @OBJEXT@ |
| 649 | OTHER_FILES = @OTHER_FILES@ | 651 | OTHER_FILES = @OTHER_FILES@ |
| 650 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | 652 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
| @@ -863,6 +865,7 @@ XRANDR_LIBS = @XRANDR_LIBS@ | |||
| 863 | XWIDGETS_OBJ = @XWIDGETS_OBJ@ | 865 | XWIDGETS_OBJ = @XWIDGETS_OBJ@ |
| 864 | X_TOOLKIT_TYPE = @X_TOOLKIT_TYPE@ | 866 | X_TOOLKIT_TYPE = @X_TOOLKIT_TYPE@ |
| 865 | ac_ct_CC = @ac_ct_CC@ | 867 | ac_ct_CC = @ac_ct_CC@ |
| 868 | ac_ct_OBJC = @ac_ct_OBJC@ | ||
| 866 | archlibdir = @archlibdir@ | 869 | archlibdir = @archlibdir@ |
| 867 | bindir = @bindir@ | 870 | bindir = @bindir@ |
| 868 | bitmapdir = @bitmapdir@ | 871 | bitmapdir = @bitmapdir@ |