svn commit: r946261 - in /incubator/thrift/branches/0.3.0: configure.ac lib/erl/Makefile.am

[br...@apache.org]

Author: bryanduxbury
Date: Wed May 19 16:28:08 2010
New Revision: 946261

URL: http://svn.apache.org/viewvc?rev=946261&view=rev
Log:
Merge in THRIFT-784 and THRIFT-646

Modified:
    incubator/thrift/branches/0.3.0/configure.ac
    incubator/thrift/branches/0.3.0/lib/erl/Makefile.am

Modified: incubator/thrift/branches/0.3.0/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/branches/0.3.0/configure.ac?rev=946261&r1=946260&r2=946261&view=diff
==============================================================================
--- incubator/thrift/branches/0.3.0/configure.ac (original)
+++ incubator/thrift/branches/0.3.0/configure.ac Wed May 19 16:28:08 2010
@@ -93,9 +93,11 @@ AM_CONDITIONAL([WITH_JAVA],
 
 AX_THRIFT_LIB(erlang, [Erlang], yes)
 if test "$with_erlang" = "yes";  then
-  AC_PATH_PROG([ERLC], [erlc])
+  AC_ERLANG_PATH_ERL
+  AC_ERLANG_PATH_ERLC
+  AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 fi
-AM_CONDITIONAL(WITH_ERLANG, [test -n "$ERLC"])
+AM_CONDITIONAL(WITH_ERLANG, [test -n "$ERL" -a -n "$ERLC"])
 
 AX_THRIFT_LIB(py, [Python], yes)
 if test "$with_py" = "yes";  then

Modified: incubator/thrift/branches/0.3.0/lib/erl/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/branches/0.3.0/lib/erl/Makefile.am?rev=946261&r1=946260&r2=946261&view=diff
==============================================================================
--- incubator/thrift/branches/0.3.0/lib/erl/Makefile.am (original)
+++ incubator/thrift/branches/0.3.0/lib/erl/Makefile.am Wed May 19 16:28:08 2010
@@ -17,9 +17,6 @@
 # under the License.
 #
 
-# directory where erlang library code should live
-ERL_LIB_ROOT_DIR=$(shell erl -eval 'io:format("~s~n", [code:lib_dir()])' -s init stop -noshell)
-
 MODULES = \
 	src
 
@@ -28,30 +25,20 @@ all clean docs:
 		(cd $$dir; ${MAKE} $@); \
 	done
 
-ERLLIBDIR=$(DESTDIR)$(ERL_LIB_ROOT_DIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
-
 install: all
-	mkdir -p $(ERLLIBDIR) ; \
-	mkdir -p $(ERLLIBDIR)/ebin ; \
-	mkdir -p $(ERLLIBDIR)/include ; \
-	mkdir -p $(ERLLIBDIR)/src ; \
-	for i in ebin/*.app*   ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done ; \
-	for i in ebin/*.beam   ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done ; \
-	for i in include/*.hrl ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done ; \
-	for i in src/*.erl     ; do $(INSTALL) $$i $(ERLLIBDIR)/$$i ; done
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift) ; \
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \
+	mkdir -p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \
+	for p in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \
+		do $(INSTALL) $$p $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \
+	done
 
 uninstall:
-	rm -rf $(ERLLIBDIR)
+	rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)
 
-check: all
 
-distclean: clean
-
-# Hack to make "make dist" work.
-# This should not work, but it appears to.
-distdir:
+maintainer-clean-local:
+	rm -rf ebin
 
 MAINTAINERCLEANFILES = Makefile.in
-
-maintainer-clean:
-	test ! -d ebin || rm -rf ebin