couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rand...@apache.org
Subject [2/3] git commit: don't ln the couchjs install target on windows
Date Fri, 06 Jan 2012 23:47:12 GMT
don't ln the couchjs install target on windows

On windows we install binaries directly into $(prefix)/bin rather than
a local bin directory hidden away in the erlang module. Therefore, when
building this way, don't try to create a symbolic link into the final
location since the final location has the output binary already.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7c303b9c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7c303b9c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7c303b9c

Branch: refs/heads/1.2.x
Commit: 7c303b9c57b4ccd347489eddfc66d1998202dade
Parents: f7b2fa9
Author: Randall Leeds <randall@apache.org>
Authored: Fri Jan 6 15:29:51 2012 -0800
Committer: Randall Leeds <randall@apache.org>
Committed: Fri Jan 6 15:40:58 2012 -0800

----------------------------------------------------------------------
 bin/Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c303b9c/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 320c8a7..f391154 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -48,9 +48,11 @@ couchdb: couchdb.tpl
 	$@ < $<
 	chmod +x $@
 
+if !WINDOWS
 install-exec-hook:
 	$(LN_S) -f "$(locallibbindir)/$(couchjs_command_name)" \
 		"$(DESTDIR)$(bindir)/$(couchjs_command_name)"
+endif
 
 couchjs_dev:
 	$(LN_S) -f "$(abs_top_builddir)/src/couchdb/priv/couchjs" "$@"


Mime
View raw message