[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108324: Auto-commit of generated fil
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108324: Auto-commit of generated files. |
Date: |
Mon, 21 May 2012 06:17:34 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 108324
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 06:17:34 -0400
message:
Auto-commit of generated files.
modified:
autogen/Makefile.in
autogen/configure
=== modified file 'autogen/Makefile.in'
--- a/autogen/Makefile.in 2012-05-18 10:17:28 +0000
+++ b/autogen/Makefile.in 2012-05-21 10:17:34 +0000
@@ -492,7 +492,6 @@
LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@
LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@
LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@
-LEIM_INSTALLDIR = @LEIM_INSTALLDIR@
LIBGIF = @LIBGIF@
LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
@@ -755,6 +754,7 @@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+leimdir = @leimdir@
libdir = @libdir@
libexecdir = @libexecdir@
liblockfile = @liblockfile@
=== modified file 'autogen/configure'
--- a/autogen/configure 2012-05-20 10:18:48 +0000
+++ b/autogen/configure 2012-05-21 10:17:34 +0000
@@ -1099,6 +1099,7 @@
x_default_search_path
lisppath
locallisppath
+leimdir
lispdir
srcdir
canonical
@@ -1164,7 +1165,6 @@
NS_OBJC_OBJ
NS_OBJ
ns_self_contained
-LEIM_INSTALLDIR
INSTALL_ARCH_INDEP_EXTRA
TEMACS_LDFLAGS2
LD_SWITCH_X_SITE_RPATH
@@ -3731,6 +3731,7 @@
lispdir='${datadir}/emacs/${version}/lisp'
+leimdir='${datadir}/emacs/${version}/leim'
locallisppath='${datadir}/emacs/${version}/site-lisp:'\
'${datadir}/emacs/site-lisp'
lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
@@ -10109,7 +10110,6 @@
INSTALL_ARCH_INDEP_EXTRA=install-etc
-LEIM_INSTALLDIR="\${install_prefix}/leim"
ns_self_contained=no
ns_frag=/dev/null
NS_OBJ=
@@ -10133,7 +10133,7 @@
infodir="\${ns_appresdir}/info"
mandir="\${ns_appresdir}/man"
lispdir="\${ns_appresdir}/lisp"
- LEIM_INSTALLDIR="\${ns_appresdir}/leim"
+ leimdir="\${ns_appresdir}/leim"
INSTALL_ARCH_INDEP_EXTRA=
fi
ns_frag=$srcdir/src/ns.mk
@@ -10149,7 +10149,6 @@
-
case "${window_system}" in
x11 )
HAVE_X_WINDOWS=yes
@@ -15992,6 +15991,7 @@
+
## FIXME? Nothing uses @address@hidden
## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
## end of LIBX_BASE, but nothing ever set it.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108324: Auto-commit of generated files.,
Glenn Morris <=