GNU make already knows what the current directory is, there is no need to use 'pwd'
authorKevin P. Fleming <kpfleming@digium.com>
Mon, 1 Jan 2007 22:59:01 +0000 (22:59 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Mon, 1 Jan 2007 22:59:01 +0000 (22:59 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49101 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
sounds/Makefile

index 9140812..0145a78 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ endif
 # Create OPTIONS variable
 OPTIONS=
 
-ASTTOPDIR:=$(shell pwd)
+ASTTOPDIR:=$(CURDIR)
 
 # Overwite config files on "make samples"
 OVERWRITE=y
index b2a2a2e..df8aedc 100644 (file)
@@ -15,7 +15,6 @@
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/makeopts
 
-PWD:=$(shell pwd)
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
 CORE_SOUNDS_VERSION:=1.4.5
@@ -80,7 +79,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-en-%: have_download
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
        rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-       (cd $(SOUNDS_DIR)/en; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(SOUNDS_DIR)/en; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download
@@ -88,7 +87,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-es-%: have_download
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
        rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-       (cd $(SOUNDS_DIR)/es; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(SOUNDS_DIR)/es; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 $(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: have_download
@@ -96,7 +95,7 @@ $(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: have_download
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
        rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-       (cd $(SOUNDS_DIR)/fr; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(SOUNDS_DIR)/fr; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 $(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: have_download
@@ -104,7 +103,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-en-%: have_download
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
        rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
-       (cd $(SOUNDS_DIR)/en; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(SOUNDS_DIR)/en; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: have_download
@@ -112,7 +111,7 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-es-%: have_download
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
        rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
-       (cd $(SOUNDS_DIR)/es; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(SOUNDS_DIR)/es; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 $(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: have_download
@@ -120,14 +119,14 @@ $(SOUNDS_DIR)/.asterisk-extra-sounds-fr-%: have_download
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
        rm -f $(subst -$(EXTRA_SOUNDS_VERSION),,$@)-* && \
-       (cd $(SOUNDS_DIR)/fr; cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(SOUNDS_DIR)/fr; cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 $(MOH_DIR)/.asterisk-moh-%: have_download
        @PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \
        if test ! -f $${PACKAGE}; then $(DOWNLOAD) $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
        if test ! -f $${PACKAGE}; then exit 1; fi; \
-       (cd $(MOH_DIR); cat $(PWD)/$${PACKAGE} | gzip -d | tar xf -) && \
+       (cd $(MOH_DIR); cat $(CURDIR)/$${PACKAGE} | gzip -d | tar xf -) && \
        touch $@
 
 asterisk-core-%.tar.gz: have_download