From 814fe2f722e39076cd0770e967aea71c2e92b044 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 20 Jan 2014 20:20:02 -0600 Subject: Install aclocal macros into sysroots --- cygwin-pkg-config.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cygwin-pkg-config.spec') diff --git a/cygwin-pkg-config.spec b/cygwin-pkg-config.spec index 7573c24..59582a3 100644 --- a/cygwin-pkg-config.spec +++ b/cygwin-pkg-config.spec @@ -1,6 +1,6 @@ Name: cygwin-pkg-config Version: 0.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A tool for determining compilation options License: GPLv2+ @@ -75,11 +75,10 @@ popd %install -make install -C build_cyg32 DESTDIR=$RPM_BUILD_ROOT -make install -C build_cyg64 DESTDIR=$RPM_BUILD_ROOT +make install -C build_cyg32 DESTDIR=$RPM_BUILD_ROOT m4dir=%{cygwin32_datadir}/aclocal +make install -C build_cyg64 DESTDIR=$RPM_BUILD_ROOT m4dir=%{cygwin64_datadir}/aclocal # These files conflict with ordinary pkg-config. -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/aclocal rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/pkg-config @@ -87,14 +86,19 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/pkg-config %doc AUTHORS README NEWS COPYING pkg-config-guide.html %{_bindir}/%{cygwin32_target}-pkg-config %{_mandir}/man1/%{cygwin32_target}-pkg-config.1* +%{cygwin32_datadir}/aclocal/pkg.m4 %files -n cygwin64-pkg-config %doc AUTHORS README NEWS COPYING pkg-config-guide.html %{_bindir}/%{cygwin64_target}-pkg-config %{_mandir}/man1/%{cygwin64_target}-pkg-config.1* +%{cygwin64_datadir}/aclocal/pkg.m4 %changelog +* Mon Jan 20 2014 Yaakov Selkowitz - 0.28-3 +- Install aclocal macros in the sysroots. + * Thu Jun 27 2013 Yaakov Selkowitz - 0.28-2 - Configure system include and library paths to avoid -I and -L flags. -- cgit