From: Paul Belanger Date: Mon, 3 May 2010 17:37:13 +0000 (+0000) Subject: Merged revisions 260661-260662 via svnmerge from X-Git-Tag: 1.6.1.20-rc1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=811de1769e9ae61de113375ed3740555d3b38a87;p=thirdparty%2Fasterisk.git Merged revisions 260661-260662 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260661 | pabelanger | 2010-05-03 12:41:30 -0400 (Mon, 03 May 2010) | 10 lines non-root make install PREFIX=/tmp fails. Prepend libdir when executing mkpkgconfig allowing non-root installs to work. (closes issue #17268) Reported by: pabelanger Patches: issue17268.patch uploaded by pabelanger (license 224) Tested by: pabelanger ........ r260662 | pabelanger | 2010-05-03 12:54:41 -0400 (Mon, 03 May 2010) | 3 lines Should have removed /usr/lib/ part. Thanks Qwell. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@260741 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index eca0d7ea43..3e1ff63c96 100644 --- a/Makefile +++ b/Makefile @@ -466,7 +466,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean rm -f build_tools/menuselect-deps datafiles: _all - CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; + CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig; # Should static HTTP be installed during make samples or even with its own target ala # webvoicemail? There are portions here that *could* be customized but might also be # improved a lot. I'll put it here for now.