diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-11-10 17:27:16 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-11-10 17:27:16 +0000 |
| commit | 87e4d0657e6888b2dd7f46879fdbe88e5168bb2a (patch) | |
| tree | 87a00110bbdf839e0a2d22f4aafea43c82d7b83a /astro/wcslib/files | |
| parent | e9d8c3207ea5461719d6d9abb2518763f8813a76 (diff) | |
| download | ports-87e4d0657e6888b2dd7f46879fdbe88e5168bb2a.tar.gz ports-87e4d0657e6888b2dd7f46879fdbe88e5168bb2a.zip | |
- Support staging, which allows us to simplify the Makefile a bit.
- Fix a regression introduced in r297435 (ports/167611) that hardcoded
wcslib.pc's installation path and rendered the sed call in the post-patch
target useless. This broke automated builds in things like Poudriere.
PR: ports/183718
Submitted by: rakuco@
Approved by: Tony Maher <tonymaher@optusnet.com.au> (maintainer)
Notes
Notes:
svn path=/head/; revision=333411
Diffstat (limited to 'astro/wcslib/files')
| -rw-r--r-- | astro/wcslib/files/patch-GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/astro/wcslib/files/patch-GNUmakefile b/astro/wcslib/files/patch-GNUmakefile index 3ed59254c878..a8e7c2b92dca 100644 --- a/astro/wcslib/files/patch-GNUmakefile +++ b/astro/wcslib/files/patch-GNUmakefile @@ -22,11 +22,11 @@ - $(INSTALL) -m 444 html/* $(HTMLDIR)/html - if [ ! -d "$(LIBDIR)/pkgconfig" ] ; then \ - $(INSTALL) -d -m 2775 $(LIBDIR)/pkgconfig ; \ -+ if [ ! -d "/usr/local/libdata/pkgconfig" ] ; then \ -+ $(INSTALL) -d -m 2775 /usr/local/libdata/pkgconfig ; \ ++ if [ ! -d "%%PKGDIR%%/pkgconfig" ] ; then \ ++ $(INSTALL) -d -m 2775 %%PKGDIR%%/pkgconfig ; \ fi - $(INSTALL) -m 444 wcslib.pc $(LIBDIR)/pkgconfig/wcslib.pc -+ $(INSTALL) -m 444 wcslib.pc /usr/local/libdata/pkgconfig/wcslib.pc ++ $(INSTALL) -m 444 wcslib.pc %%PKGDIR%%/pkgconfig/wcslib.pc clean cleaner : for DIR in $(SUBDIRS) doxygen ; do \ |