diff options
author | Mark Spencer <markster@digium.com> | 2004-11-11 20:57:49 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-11-11 20:57:49 +0000 |
commit | c4cca41a726cb2bb37f34c81794efaaab3572f39 (patch) | |
tree | f80ad44b51ce450c93ec0e76f6eaac42524d1a36 | |
parent | b1b95fe6f10879d085fa00f07f9e115a9bf93d62 (diff) |
Fix for DESTDIR
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | mkpkgconfig | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -314,7 +314,7 @@ clean: $(MAKE) -C stdtime clean datafiles: all - sh mkpkgconfig + sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits for x in sounds/digits/*.gsm; do \ if grep -q "^%`basename $$x`%" sounds.txt; then \ diff --git a/mkpkgconfig b/mkpkgconfig index 7b1b78f48..a4f143bed 100755 --- a/mkpkgconfig +++ b/mkpkgconfig @@ -1,5 +1,5 @@ #!/bin/bash - +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 /usr/lib/pkgconfig ]; then +if [ ! -d $PPATH ]; then exit fi @@ -22,7 +22,7 @@ LOCAL_CFLAGS=$(echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s* sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g' ) -cat <<EOF > /usr/lib/pkgconfig/asterisk.pc +cat <<EOF > $PPATH/asterisk.pc install_prefix=$INSTALL_PREFIX version_number=$ASTERISKVERSIONNUM etcdir=$ASTETCDIR |