[svn-commits] pabelanger: trunk r260663 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Mon May  3 12:06:48 2010
New Revision: 260663

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=260663
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=260663&r1=260662&r2=260663
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon May  3 12:06:48 2010
@@ -489,7 +489,7 @@
 	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.