aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 20:35:06 +0000
committerpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 20:35:06 +0000
commit67c79ab8abaf2af8019b835deab1844e6a4bc13d (patch)
tree6bf6fdadd6a889a2732ad098dddc678523d961ca /Makefile
parent11fb584eb24a8c377016be9881185cbe6ab6d0a4 (diff)
Merged revisions 269889 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r269889 | pabelanger | 2010-06-10 16:30:44 -0400 (Thu, 10 Jun 2010) | 8 lines Remove ASTBINDIR variable (closes issue #17031) Reported by: pabelanger Patches: Makefile.ASTBINDIR.v2.patch uploaded by pabelanger (license 224) Tested by: pabelanger, tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@269894 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 20d522406..66809e78c 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,6 @@ export ASTLOGDIR
export ASTLIBDIR
export ASTMANDIR
export ASTHEADERDIR
-export ASTBINDIR
export ASTSBINDIR
export AGI_DIR
export ASTCONFPATH
@@ -136,7 +135,6 @@ ifeq ($(OSARCH),SunOS)
ASTSPOOLDIR=/var/spool/asterisk
ASTLOGDIR=/var/log/asterisk
ASTHEADERDIR=/opt/asterisk/include
- ASTBINDIR=/opt/asterisk/bin
ASTSBINDIR=/opt/asterisk/sbin
ASTVARRUNDIR=/var/run/asterisk
ASTMANDIR=/opt/asterisk/man
@@ -144,7 +142,6 @@ else
ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk
ASTHEADERDIR=$(includedir)/asterisk
- ASTBINDIR=$(bindir)
ASTSBINDIR=$(sbindir)
ASTSPOOLDIR=$(localstatedir)/spool/asterisk
ASTLOGDIR=$(localstatedir)/log/asterisk
@@ -545,7 +542,6 @@ installdirs:
mkdir -p $(DESTDIR)$(MODULES_DIR)
mkdir -p $(DESTDIR)$(ASTSBINDIR)
mkdir -p $(DESTDIR)$(ASTETCDIR)
- mkdir -p $(DESTDIR)$(ASTBINDIR)
mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate