From 4150c3da2191f3ed33b236ab0593a11845fe30bc Mon Sep 17 00:00:00 2001 From: Paul W. Frields Date: Dec 18 2010 17:33:06 +0000 Subject: Remove unnecessary flags and fix use of libdir instead --- diff --git a/xmlstarlet-1.0.3-nostatic.patch b/xmlstarlet-1.0.3-nostatic.patch index 0de311d..5a4c8d3 100644 --- a/xmlstarlet-1.0.3-nostatic.patch +++ b/xmlstarlet-1.0.3-nostatic.patch @@ -10,7 +10,7 @@ diff -uNr xmlstarlet-1.0.3-original/configure.ac xmlstarlet-1.0.3/configure.ac -[LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"] + [: ${LIBXML_INCDIR="`xml2-config --cflags`"}]) +[LIBXML_LIBS="`xml2-config --libs`"] -+[LIBXML_CPPFLAGS="-DLIBXML_STATIC $LIBXML_INCDIR"] ++[LIBXML_CPPFLAGS="$LIBXML_INCDIR"] XSTAR_LIB_CHECK([LIBXSLT], [xslt-config]) [: ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}] diff --git a/xmlstarlet.spec b/xmlstarlet.spec index b7344d8..3e6f32d 100644 --- a/xmlstarlet.spec +++ b/xmlstarlet.spec @@ -32,7 +32,7 @@ commands. %build autoreconf -i -%configure --with-libxml-prefix=%{_prefix} --with-libxslt-prefix=%{_prefix} +%configure --libdir=%{_libdir} make %{?_smp_mflags} cd $RPM_BUILD_DIR/%{name}-%{version}/doc xmlto man xmlstarlet-man.xml