aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 20:30:44 +0000
committerpabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-10 20:30:44 +0000
commit833674330ea1996b2401f2093caea4f071419879 (patch)
treea0b012fe339ea4d93ea0564d1f5a4391351a29fd
parent310570e0f41b2c8283a1ab08876cad929187a218 (diff)
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/trunk@269889 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile4
-rw-r--r--makeopts.in1
2 files changed, 0 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 20b5ecf17..7055d4117 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
@@ -137,7 +136,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
@@ -145,7 +143,6 @@ else
ASTETCDIR=$(sysconfdir)/asterisk
ASTLIBDIR=$(libdir)/asterisk
ASTHEADERDIR=$(includedir)/asterisk
- ASTBINDIR=$(bindir)
ASTSBINDIR=$(sbindir)
ASTSPOOLDIR=$(localstatedir)/spool/asterisk
ASTLOGDIR=$(localstatedir)/log/asterisk
@@ -562,7 +559,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
diff --git a/makeopts.in b/makeopts.in
index 668416a19..99fc89e4f 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -61,7 +61,6 @@ GNU_LD=@GNU_LD@
prefix = @prefix@
exec_prefix = @exec_prefix@
-bindir = @bindir@
datarootdir = @datarootdir@
datadir = @datadir@
includedir = @includedir@