diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-03 17:37:13 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-03 17:37:13 +0000 |
| commit | 8671effe05be55f68c7579b450f631fc49c8c9a9 (patch) | |
| tree | f1ac405903194cd995880e3cbb8f49af42268844 | |
| parent | c63da7d8c1643b7811b71082d6fa984e9917169c (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@260741 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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. |