[Freeswitch-svn] [commit] r4584 - freeswitch/trunk/build

[Freeswitch SVN]

Author: mikej
Date: Tue Mar 13 13:46:44 2007
New Revision: 4584

Modified:
   freeswitch/trunk/build/modmake.rules.in

Log:
get the include directory right in generated makefiles for both in tree and out of tree modules

Modified: freeswitch/trunk/build/modmake.rules.in
==============================================================================
--- freeswitch/trunk/build/modmake.rules.in	(original)
+++ freeswitch/trunk/build/modmake.rules.in	Tue Mar 13 13:46:44 2007
@@ -48,9 +48,10 @@
 extraclean: distclean local_extraclean
 
 Makefile:
-	@if test ! -f $@; then \
+	if test ! -f $@; then \
 	  echo MODNAME=$(MODNAME) > Makefile ; \
-	  echo include $(switch_srcdir)/build/modmake.rules >> Makefile ; \
+	  if ! pwd | grep $(switch_srcdir)/src/mod ; then rulesdir=$(switch_srcdir) ; else rulesdir=../../../.. ; fi ; \
+	  echo include $$rulesdir/build/modmake.rules >> Makefile ; \
 	fi ;
 
 $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) $(SOURCEFILE)