From c4cca41a726cb2bb37f34c81794efaaab3572f39 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Thu, 11 Nov 2004 20:57:49 +0000 Subject: [PATCH] Fix for DESTDIR git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4212 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 2 +- mkpkgconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8fc73c3edc..f74d153c8c 100755 --- a/Makefile +++ b/Makefile @@ -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 7b1b78f48d..a4f143bed1 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 < /usr/lib/pkgconfig/asterisk.pc +cat < $PPATH/asterisk.pc install_prefix=$INSTALL_PREFIX version_number=$ASTERISKVERSIONNUM etcdir=$ASTETCDIR