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: https://origsvn.digium.com/svn/asterisk/trunk@269889 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 20b5ecf..7055d41 100644 (file)
--- 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 668416a..99fc89e 100644 (file)
--- 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@