| Index: third_party/libxslt/linux/Makefile
|
| diff --git a/third_party/libxslt/linux/Makefile b/third_party/libxslt/linux/Makefile
|
| index bd3e9d112da1d82897cb4a79cb50ac11d03cccaf..cf7495ae49f868e4cf9aa508b59a2b5c4f081765 100644
|
| --- a/third_party/libxslt/linux/Makefile
|
| +++ b/third_party/libxslt/linux/Makefile
|
| @@ -15,7 +15,7 @@
|
|
|
|
|
|
|
| -VPATH = ..
|
| +VPATH = ../src
|
| am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
| am__make_running_with_option = \
|
| case $${target_option-} in \
|
| @@ -226,14 +226,14 @@ distuninstallcheck_listfiles = find . -type f -print
|
| am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
| | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
| distcleancheck_listfiles = find . -type f -print
|
| -ACLOCAL = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/missing aclocal-1.14
|
| +ACLOCAL = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/src/missing aclocal-1.14
|
| AMTAR = $${TAR-tar}
|
| AM_DEFAULT_VERBOSITY = 0
|
| AR = ar
|
| AS = as
|
| -AUTOCONF = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/missing autoconf
|
| -AUTOHEADER = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/missing autoheader
|
| -AUTOMAKE = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/missing automake-1.14
|
| +AUTOCONF = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/src/missing autoconf
|
| +AUTOHEADER = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/src/missing autoheader
|
| +AUTOMAKE = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/src/missing automake-1.14
|
| AWK = gawk
|
| CC = gcc
|
| CCDEPMODE = depmode=gcc3
|
| @@ -254,7 +254,7 @@ EGREP = /bin/grep -E
|
| EXEEXT =
|
| EXSLT_INCLUDEDIR = -I${includedir}
|
| EXSLT_LIBDIR = -L${libdir}
|
| -EXSLT_LIBS = -lexslt -lxslt -L/usr/local/google/work/ca/src/third_party/libxml/linux -L/usr/local/lib -lxml2 -lz -licui18n -licuuc -licudata -lm -ldl -lm -lgcrypt
|
| +EXSLT_LIBS = -lexslt -lxslt -L/usr/local/google/work/ca/src/third_party/libxml/linux -L/usr/local/lib -lxml2 -licui18n -licuuc -licudata -lm -lm -lgcrypt
|
| EXTRA_LIBS =
|
| FGREP = /bin/grep -F
|
| GREP = /bin/grep
|
| @@ -280,9 +280,9 @@ LIBOBJS =
|
| LIBS =
|
| LIBTOOL = $(SHELL) $(top_builddir)/libtool
|
| LIBXML_CFLAGS = -I/usr/local/google/work/ca/src/third_party/libxml/linux/include
|
| -LIBXML_LIBS = -L/usr/local/google/work/ca/src/third_party/libxml/linux -L/usr/local/lib -lxml2 -lz -licui18n -licuuc -licudata -lm -ldl
|
| +LIBXML_LIBS = -L/usr/local/google/work/ca/src/third_party/libxml/linux -L/usr/local/lib -lxml2 -licui18n -licuuc -licudata -lm
|
| LIBXML_REQUIRED_VERSION = 2.6.27
|
| -LIBXML_SRC = ../../libxml/linux/
|
| +LIBXML_SRC = /usr/local/google/work/ca/src/third_party/libxml/linux
|
| LIBXSLT_DEFAULT_PLUGINS_PATH = /usr/local/lib/libxslt-plugins
|
| LIBXSLT_MAJOR_MINOR_VERSION = 1.1
|
| LIBXSLT_MAJOR_VERSION = 1
|
| @@ -295,7 +295,7 @@ LIBXSLT_VERSION_NUMBER = 10129
|
| LIPO =
|
| LN_S = ln -s
|
| LTLIBOBJS =
|
| -MAKEINFO = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/missing makeinfo
|
| +MAKEINFO = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/src/missing makeinfo
|
| MANIFEST_TOOL = :
|
| MKDIR_P = /bin/mkdir -p
|
| MV = /bin/mv
|
| @@ -323,7 +323,7 @@ PYTHON_SITE_PACKAGES = /usr/lib/python2.7/dist-packages
|
| PYTHON_SUBDIR = python
|
| PYTHON_VERSION = 2.7
|
| RANLIB = ranlib
|
| -RELDATE = Tue Mar 28 2017
|
| +RELDATE = Mon May 8 2017
|
| RM = /bin/rm
|
| SED = /bin/sed
|
| SET_MAKE =
|
| @@ -347,13 +347,13 @@ XSLTPROC = /usr/bin/xsltproc
|
| XSLTPROCDV =
|
| XSLT_INCLUDEDIR = -I${includedir}
|
| XSLT_LIBDIR = -L${libdir}
|
| -XSLT_LIBS = -lxslt -L/usr/local/google/work/ca/src/third_party/libxml/linux -L/usr/local/lib -lxml2 -lz -licui18n -licuuc -licudata -lm -ldl -lm
|
| +XSLT_LIBS = -lxslt -L/usr/local/google/work/ca/src/third_party/libxml/linux -L/usr/local/lib -lxml2 -licui18n -licuuc -licudata -lm -lm
|
| XSLT_LOCALE_WINAPI = 0
|
| XSLT_LOCALE_XLOCALE = 1
|
| abs_builddir = /usr/local/google/work/ca/src/third_party/libxslt/linux
|
| -abs_srcdir = /usr/local/google/work/ca/src/third_party/libxslt/linux/..
|
| +abs_srcdir = /usr/local/google/work/ca/src/third_party/libxslt/linux/../src
|
| abs_top_builddir = /usr/local/google/work/ca/src/third_party/libxslt/linux
|
| -abs_top_srcdir = /usr/local/google/work/ca/src/third_party/libxslt/linux/..
|
| +abs_top_srcdir = /usr/local/google/work/ca/src/third_party/libxslt/linux/../src
|
| ac_ct_AR = ar
|
| ac_ct_CC = gcc
|
| ac_ct_DUMPBIN =
|
| @@ -382,7 +382,7 @@ host_vendor = unknown
|
| htmldir = ${docdir}
|
| includedir = ${prefix}/include
|
| infodir = ${datarootdir}/info
|
| -install_sh = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/install-sh
|
| +install_sh = ${SHELL} /usr/local/google/work/ca/src/third_party/libxslt/src/install-sh
|
| libdir = ${exec_prefix}/lib
|
| libexecdir = ${exec_prefix}/libexec
|
| localedir = ${datarootdir}/locale
|
| @@ -397,12 +397,12 @@ psdir = ${docdir}
|
| pythondir = $(libdir)/python$(PYTHON_VERSION)/site-packages
|
| sbindir = ${exec_prefix}/sbin
|
| sharedstatedir = ${prefix}/com
|
| -srcdir = ..
|
| +srcdir = ../src
|
| sysconfdir = ${prefix}/etc
|
| target_alias =
|
| top_build_prefix =
|
| top_builddir = .
|
| -top_srcdir = ..
|
| +top_srcdir = ../src
|
| SUBDIRS = \
|
| libxslt \
|
| libexslt \
|
|
|