[svn-commits] pabelanger: branch 1.6.2 r269894 - in /branches/1.6.2: ./ Makefile makeopts.in

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Jun 10 15:35:06 2010
New Revision: 269894

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=269894
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/Makefile
    branches/1.6.2/makeopts.in

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/Makefile?view=diff&rev=269894&r1=269893&r2=269894
==============================================================================
--- branches/1.6.2/Makefile (original)
+++ branches/1.6.2/Makefile Thu Jun 10 15:35:06 2010
@@ -56,7 +56,6 @@
 export ASTLIBDIR
 export ASTMANDIR
 export ASTHEADERDIR
-export ASTBINDIR
 export ASTSBINDIR
 export AGI_DIR
 export ASTCONFPATH
@@ -136,7 +135,6 @@
   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 @@
   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 @@
 	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

Modified: branches/1.6.2/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/makeopts.in?view=diff&rev=269894&r1=269893&r2=269894
==============================================================================
--- branches/1.6.2/makeopts.in (original)
+++ branches/1.6.2/makeopts.in Thu Jun 10 15:35:06 2010
@@ -57,7 +57,6 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-bindir = @bindir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@