From 748431f7b6375e0006937e8c9fbcdaed5779ca0a Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 6 Jul 2006 21:04:28 +0000 Subject: move rules file to prepare for generic rules file git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37222 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c0d1fcb9a..71819551d 100644 --- a/Makefile +++ b/Makefile @@ -25,14 +25,14 @@ OPTIONS= #SUB_PROC=xscale # or maverick ifeq ($(CROSS_COMPILE),) - OSARCH=$(shell uname -s) - PROC?=$(shell uname -m) + OSARCH:=$(shell uname -s) + PROC?:=$(shell uname -m) else OSARCH=$(CROSS_ARCH) PROC=$(CROSS_PROC) endif -PWD=$(shell pwd) +ASTTOPDIR:=$(shell pwd) # Remember the MAKELEVEL at the top MAKETOPLEVEL?=$(MAKELEVEL) @@ -886,7 +886,7 @@ menuselect: menuselect/menuselect makeopts.xml -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!" menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h menuselect/linkedlists.h config.status mxml/libmxml.a - @CFLAGS="-include $(PWD)/include/asterisk/autoconfig.h -I$(PWD)/include" PARENTSRC="$(PWD)" $(MAKE) -C menuselect menuselect + @CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect menuselect mxml/libmxml.a: @cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure -- cgit v1.2.3