aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-11-11 20:57:49 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-11-11 20:57:49 +0000
commitdefcc2ef52a4db8e9e7738113f0acdb90de3863d (patch)
treef80ad44b51ce450c93ec0e76f6eaac42524d1a36
parentced27b9053f782f03a713d863afe4a16006fb706 (diff)
Fix for DESTDIR
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4212 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xMakefile2
-rwxr-xr-xmkpkgconfig6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8fc73c3ed..f74d153c8 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 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