repaired build system

richcarl · Apr 12, 2013 · 6507571 · 6507571
1 parent c9c9a86
commit 6507571
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -9,9 +9,6 @@ clean:
 	(cd src;$(MAKE) clean)
 	(cd c_src;$(MAKE) clean)
 
-release: clean appfile
-	sh ../../support/create_release.sh
-
 appfile:
 	(cd src && $(MAKE) ../ebin/fd_server.app)
 

diff --git a/c_src/Makefile b/c_src/Makefile
@@ -1,5 +1,5 @@
 
-include ../../../support/include.mk
+include ../config/include.mk
 
 
 ## don't build this under win32 or mac osx at all

diff --git a/config/configure.in b/config/configure.in
@@ -8,6 +8,12 @@ dnl Programs
 
 AC_PROG_CC
 
+AC_PATH_PROG(ERL, erl, erl)
+AC_PATH_PROG(ERLC, erlc, erlc)
+JUNGERL_DIR=$(dirname `pwd`)
+AC_SUBST(JUNGERL_DIR)
+ERLDIR=`awk -F= '/ROOTDIR=/ { print [$]2; exit; }' $ERL`
+AC_SUBST(ERLDIR)
 
 dnl C header files
 

diff --git a/src/Makefile b/src/Makefile
@@ -1,5 +1,5 @@
 
-include ../../../support/include.mk
+include ../config/include.mk
 
 include ../vsn.mk
 VSN=$(FD_SERVER_VSN)