diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-03 17:06:48 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-03 17:06:48 +0000 |
| commit | c127abd68bf50d23122510c6713513a84a62ffdd (patch) | |
| tree | 6ab60cd4de94a8b29b0d666da5a2ef50b6443487 /Makefile | |
| parent | ada8fb118d65d20e6c1956dd1334ba50a7b22156 (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/trunk@260663 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -489,7 +489,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. |