[Asterisk-cvs] asterisk Makefile,1.120,1.121 mkpkgconfig,1.1,1.2

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv4409

Modified Files:
	Makefile mkpkgconfig 
Log Message:
Fix for DESTDIR


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- Makefile	11 Nov 2004 14:48:53 -0000	1.120
+++ Makefile	11 Nov 2004 20:57:49 -0000	1.121
@@ -314,7 +314,7 @@
 	$(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 \

Index: mkpkgconfig
===================================================================
RCS file: /usr/cvsroot/asterisk/mkpkgconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mkpkgconfig	11 Nov 2004 14:48:53 -0000	1.1
+++ mkpkgconfig	11 Nov 2004 20:57:49 -0000	1.2
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+PPATH=$1
 ## Make sure we were called from Makefile
 
 if [ "x$ASTERISKVERSIONNUM" == "x" ]; then
@@ -9,7 +9,7 @@
 
 ## 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 @@
   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