Skip to content
Snippets Groups Projects
Commit c4cca41a authored by Mark Spencer's avatar Mark Spencer
Browse files

Fix for DESTDIR

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent b1b95fe6
Branches
Tags
No related merge requests found
...@@ -314,7 +314,7 @@ clean: ...@@ -314,7 +314,7 @@ clean:
$(MAKE) -C stdtime clean $(MAKE) -C stdtime clean
datafiles: all datafiles: all
sh mkpkgconfig sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
for x in sounds/digits/*.gsm; do \ for x in sounds/digits/*.gsm; do \
if grep -q "^%`basename $$x`%" sounds.txt; then \ if grep -q "^%`basename $$x`%" sounds.txt; then \
......
#!/bin/bash #!/bin/bash
PPATH=$1
## Make sure we were called from Makefile ## Make sure we were called from Makefile
if [ "x$ASTERISKVERSIONNUM" == "x" ]; then if [ "x$ASTERISKVERSIONNUM" == "x" ]; then
...@@ -9,7 +9,7 @@ fi ...@@ -9,7 +9,7 @@ fi
## Create a pkgconfig spec file for 3rd party modules (pkg-config asterisk --cflags) ## Create a pkgconfig spec file for 3rd party modules (pkg-config asterisk --cflags)
if [ ! -d /usr/lib/pkgconfig ]; then if [ ! -d $PPATH ]; then
exit exit
fi fi
...@@ -22,7 +22,7 @@ LOCAL_CFLAGS=$(echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s* ...@@ -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' 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 install_prefix=$INSTALL_PREFIX
version_number=$ASTERISKVERSIONNUM version_number=$ASTERISKVERSIONNUM
etcdir=$ASTETCDIR etcdir=$ASTETCDIR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment