[svn-commits] pabelanger: trunk r269889 - in /trunk: Makefile makeopts.in

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Jun 10 15:30:44 2010
New Revision: 269889

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=269889
Log:
Remove ASTBINDIR variable

(closes issue #17031)
Reported by: pabelanger
Patches:
      Makefile.ASTBINDIR.v2.patch uploaded by pabelanger (license 224)
Tested by: pabelanger, tilghman

Modified:
    trunk/Makefile
    trunk/makeopts.in

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=269889&r1=269888&r2=269889
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jun 10 15:30:44 2010
@@ -56,7 +56,6 @@
 export ASTLIBDIR
 export ASTMANDIR
 export ASTHEADERDIR
-export ASTBINDIR
 export ASTSBINDIR
 export AGI_DIR
 export ASTCONFPATH
@@ -137,7 +136,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
@@ -145,7 +143,6 @@
   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 @@
 	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: trunk/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/trunk/makeopts.in?view=diff&rev=269889&r1=269888&r2=269889
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Thu Jun 10 15:30:44 2010
@@ -61,7 +61,6 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-bindir = @bindir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@