svn commit: r945898 - /incubator/thrift/trunk/lib/erl/Makefile.am

[dr...@apache.org]

Author: dreiss
Date: Tue May 18 21:32:16 2010
New Revision: 945898

URL: http://svn.apache.org/viewvc?rev=945898&view=rev
Log:
THRIFT-784. erl: Fix two problems with "make install"

- Support DESTDIR.
- Pass proper arguments to install.

Modified:
    incubator/thrift/trunk/lib/erl/Makefile.am

Modified: incubator/thrift/trunk/lib/erl/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/Makefile.am?rev=945898&r1=945897&r2=945898&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/Makefile.am (original)
+++ incubator/thrift/trunk/lib/erl/Makefile.am Tue May 18 21:32:16 2010
@@ -26,16 +26,16 @@ all clean docs:
 	done
 
 install: all
-	mkdir -p $(ERLANG_INSTALL_LIB_DIR_thrift) ; \
-	mkdir -p $(ERLANG_INSTALL_LIB_DIR_thrift)/ebin ; \
-	mkdir -p $(ERLANG_INSTALL_LIB_DIR_thrift)/include ; \
-	mkdir -p $(ERLANG_INSTALL_LIB_DIR_thrift)/src ; \
-	for i in ebin/*.app* ebin/*.beam include/*.hrl src/*.erl ; \
-		do $(INSTALL) $$p $(ERLANG_INSTALL_LIB_DIR_thrift)/$$p ; \
+	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 $(ERLANG_INSTALL_LIB_DIR_thrift)
+	rm -rf $(DESTDIR)$(ERLANG_INSTALL_LIB_DIR_thrift)
 
 
 maintainer-clean-local: