[svn-commits] mnicholson: branch mnicholson/asttest r248097 - /team/mnicholson/asttest/astt...

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Fri Feb 19 14:56:50 2010
New Revision: 248097

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248097
Log:
Added ASTSRCDIR and ASTDSTDIR variables in the makefile to control where the asterisk source is and where the staging asterisk install should be placed.

Modified:
    team/mnicholson/asttest/asttest/Makefile

Modified: team/mnicholson/asttest/asttest/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/mnicholson/asttest/asttest/Makefile?view=diff&rev=248097&r1=248096&r2=248097
==============================================================================
--- team/mnicholson/asttest/asttest/Makefile (original)
+++ team/mnicholson/asttest/asttest/Makefile Fri Feb 19 14:56:50 2010
@@ -24,6 +24,9 @@
 DESTDIR?=
 BINDIR?=/usr/bin
 
+ASTSRCDIR ?= ../
+ASTDSCDIR ?= $(PWD)/asterisk
+
 
 LUAFILESYSTEM=luafilesystem-1.4.2
 LUASOCKET=luasocket-2.0.2
@@ -46,8 +49,6 @@
 L_LIBS:=$(LUAPOSIX_LIBS)
 L_OBJS:=lua/testlib.o lua/astlib.o lua/proclib.o
 T_LIBS:=-llua5.1
-
-AST_INSTALL_DIR = $(PWD)/asterisk
 
 
 all: asttest
@@ -91,12 +92,12 @@
 #lua/%.o: lua/%.c lua/%_lua.h include/asttest/lua/%.h
 
 asterisk:
-	cd ../ && ./configure --enable-dev-mode \
-		--prefix=$(AST_INSTALL_DIR)/usr \
-		--sysconfdir=$(AST_INSTALL_DIR)/etc \
-		--localstatedir=$(AST_INSTALL_DIR)/var
-	$(MAKE) -C ../ install
-	$(MAKE) -C ../ samples
+	cd $(ASTSRCDIR) && ./configure --enable-dev-mode \
+		--prefix=$(ASTDSTDIR)/usr \
+		--sysconfdir=$(ASTDSTDIR)/etc \
+		--localstatedir=$(ASTDSTDIR)/var
+	$(MAKE) -C $(ASTSRCDIR) install
+	$(MAKE) -C $(ASTSRCDIR) samples
 
 lib/testsuite.o: lib/testsuite.c include/asttest/testsuite.h include/asttest/asttest.h
 lib/testutils.o: lib/testutils.c include/asttest/testutils.h include/asttest/asttest.h include/asttest/testsuite.h include/asttest/lua.h
@@ -158,7 +159,7 @@
 	rm -f asttest $(OBJS) $(M_OBJS) $(C_OBJS) $(G_OBJS) $(N_OBJS) $(L_OBJS)
 	rm -f lua/*_lua.h
 	rm -f tools/mkstring
-	rm -rf $(AST_INSTALL_DIR)
+	rm -rf $(ASTDSTDIR)
 	-$(MAKE) -C lua/$(LUAFILESYSTEM) clean
 	-$(MAKE) -C lua/$(LUASOCKET) clean
 	-$(MAKE) -C lua/$(LUAPOSIX) clean