[svn-commits] pabelanger: branch pabelanger/non-root r269929 - /team/pabelanger/non-root/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Jun 10 19:49:28 2010
New Revision: 269929

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=269929
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:
    team/pabelanger/non-root/   (props changed)
    team/pabelanger/non-root/Makefile
    team/pabelanger/non-root/makeopts.in

Propchange: team/pabelanger/non-root/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/pabelanger/non-root/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 10 19:49:28 2010
@@ -1,1 +1,1 @@
-/trunk:1-269875
+/trunk:1-269875,269889

Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=269929&r1=269928&r2=269929
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Thu Jun 10 19:49:28 2010
@@ -56,7 +56,6 @@
 export ASTLIBDIR
 export ASTMANDIR
 export ASTHEADERDIR
-export ASTBINDIR
 export ASTSBINDIR
 export AGI_DIR
 export ASTCONFPATH
@@ -144,7 +143,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
@@ -152,7 +150,6 @@
   ASTETCDIR=$(sysconfdir)/asterisk
   ASTLIBDIR=$(libdir)/asterisk
   ASTHEADERDIR=$(includedir)/asterisk
-  ASTBINDIR=$(bindir)
   ASTSBINDIR=$(sbindir)
   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
   ASTLOGDIR=$(localstatedir)/log/asterisk
@@ -570,7 +567,6 @@
 	$(INSTALL) -d $(DESTDIR)$(MODULES_DIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTSBINDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
-	$(INSTALL) -d $(DESTDIR)$(ASTBINDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTVARRUNDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)
 	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail

Modified: team/pabelanger/non-root/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/makeopts.in?view=diff&rev=269929&r1=269928&r2=269929
==============================================================================
--- team/pabelanger/non-root/makeopts.in (original)
+++ team/pabelanger/non-root/makeopts.in Thu Jun 10 19:49:28 2010
@@ -61,7 +61,6 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-bindir = @bindir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@