couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rand...@apache.org
Subject [1/3] git commit: don't ln the couchjs install target on windows
Date Fri, 06 Jan 2012 23:47:12 GMT
Updated Branches:
  refs/heads/1.1.x 7d1dab7d0 -> de0f784cd
  refs/heads/1.2.x f7b2fa97c -> 7c303b9c5
  refs/heads/master 5c2c11f26 -> e3651ec5d


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/de0f784c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/de0f784c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/de0f784c

Branch: refs/heads/1.1.x
Commit: de0f784cdc90f4bb8c40ebf96644424c2ed96670
Parents: 7d1dab7
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:43:56 2012 -0800

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


http://git-wip-us.apache.org/repos/asf/couchdb/blob/de0f784c/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7d50d4e..a806a43 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