diff options
| author | Jason Parker <jparker@digium.com> | 2011-08-25 15:30:46 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-08-25 15:30:46 +0000 |
| commit | 00a8f14fb1d794a5379ca35f5328266489343adf (patch) | |
| tree | ae6568849442a3c5f5d9ad58c58be16703cc8395 /build_tools | |
| parent | 590391c03846e7bed6d2ade8cefbecd92577c25b (diff) | |
Merged revisions 333203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r333203 | qwell | 2011-08-25 10:29:56 -0500 (Thu, 25 Aug 2011) | 15 lines
Merged revisions 333201 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r333201 | qwell | 2011-08-25 10:27:06 -0500 (Thu, 25 Aug 2011) | 8 lines
Fix installation into directories containing spaces.
This also vastly simplifies the logic in sounds/Makefile
(Closes issue ASTERISK-18290)
Reported by: Paul Belanger
Review: https://reviewboard.asterisk.org/r/1379/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/mkpkgconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_tools/mkpkgconfig b/build_tools/mkpkgconfig index 522afba87..699a91b90 100755 --- a/build_tools/mkpkgconfig +++ b/build_tools/mkpkgconfig @@ -1,5 +1,5 @@ #!/bin/sh -PPATH=$1 +PPATH="$1" ## Make sure we were called from Makefile if [ "x$ASTERISKVERSIONNUM" = "x" ]; then @@ -9,7 +9,7 @@ fi ## Create a pkgconfig spec file for 3rd party modules (pkg-config asterisk --cflags) -if [ ! -d $PPATH ]; then +if [ ! -d "$PPATH" ]; then exit fi @@ -29,7 +29,7 @@ LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[W ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'` -cat <<EOF > $PPATH/asterisk.pc +cat <<EOF > "$PPATH/asterisk.pc" install_prefix=$INSTALL_PREFIX version_number=$ASTERISKVERSIONNUM etcdir=$ASTETCDIR |