diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-03-14 03:10:56 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-03-14 03:10:56 -0500 |
| commit | d3db26c4ff6c13d100e5c481d421e6c0737a433a (patch) | |
| tree | 6817522f9833c25ee64ce079da34c5bf8020ec53 | |
| parent | cf3ef263fc45e2293002f0c3147ae87927cc73de (diff) | |
| download | cygwin-filesystem-d3db26c4ff6c13d100e5c481d421e6c0737a433a.tar.gz cygwin-filesystem-d3db26c4ff6c13d100e5c481d421e6c0737a433a.tar.xz cygwin-filesystem-d3db26c4ff6c13d100e5c481d421e6c0737a433a.zip | |
Add _cygwin_datadir/pkgconfig and _datadir/pkgconfig to PKG_CONFIG_LIBDIR
| -rw-r--r-- | cygwin-filesystem.spec | 5 | ||||
| -rw-r--r-- | macros.cygwin | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/cygwin-filesystem.spec b/cygwin-filesystem.spec index 7679ee8..027ee47 100644 --- a/cygwin-filesystem.spec +++ b/cygwin-filesystem.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: cygwin-filesystem -Version: 2 +Version: 3 Release: 1%{?dist} Summary: Cygwin base filesystem and environment @@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 14 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 3-1 +- Added _cygwin_datadir/pkgconfig and _datadir/pkgconfig to PKG_CONFIG_LIBDIR. + * Thu Feb 17 2011 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 2-1 - Added dependency on redhat-rpm-config for brp-strip-static-archive which respects $STRIP. diff --git a/macros.cygwin b/macros.cygwin index f2fd7e4..e3c4d13 100644 --- a/macros.cygwin +++ b/macros.cygwin @@ -73,7 +73,8 @@ package or when debugging this package.\ %{nil} %_cygwin_env HOST_CC=gcc; export HOST_CC; \ - PKG_CONFIG_LIBDIR="%{_cygwin_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + PKG_CONFIG_LIBDIR="%{_cygwin_libdir}/pkgconfig:%{_cygwin_datadir}/pkgconfig:%{_datadir}/pkgconfig"; \ + export PKG_CONFIG_LIBDIR; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{_cygwin_target}-"; \ for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \ @@ -98,7 +99,8 @@ package or when debugging this package.\ unset x i %_cygwin_pkg_config \ - PKG_CONFIG_LIBDIR="%{_cygwin_libdir}/pkgconfig"; export PKG_CONFIG_LIBDIR; \ + PKG_CONFIG_LIBDIR="%{_cygwin_libdir}/pkgconfig:%{_cygwin_datadir}/pkgconfig:%{_datadir}/pkgconfig"; \ + export PKG_CONFIG_LIBDIR; \ unset PKG_CONFIG_PATH; \ pkg-config |