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

diff --git a/Makefile b/Makefile
index 20d522406ac9e09c1edd1acedaa1d4ef64ef57cc..66809e78c162497edbe8e49b05f3e94e1b8b2a70 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
@@ -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

diff --git a/makeopts.in b/makeopts.in
index 679994b2a085c286fc686fd7164fc1d08ed5d5fc..8de43afa4bfcc5bd1444fc126cfc13c6eda5e3e2 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -57,7 +57,6 @@ CONFIG_LDFLAGS=@CONFIG_LDFLAGS@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-bindir = @bindir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@