Updated Branches: refs/heads/1.1.x de0f784cd -> d59d1c08d refs/heads/1.2.x 7c303b9c5 -> 4f2a0794a refs/heads/master e3651ec5d -> 1054f9493
COUCHDB-1152 remove icu version dependency (win) Patch by Dave Cottlehuber. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d59d1c08 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d59d1c08 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d59d1c08 Branch: refs/heads/1.1.x Commit: d59d1c08df1cea2efd9cdb072a8a8c3210aa89a5 Parents: de0f784 Author: Randall Leeds <rand...@apache.org> Authored: Fri Jan 6 17:09:30 2012 -0800 Committer: Randall Leeds <rand...@apache.org> Committed: Fri Jan 6 17:11:23 2012 -0800 ---------------------------------------------------------------------- src/couchdb/priv/Makefile.am | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/d59d1c08/src/couchdb/priv/Makefile.am ---------------------------------------------------------------------- diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am index b55b590..b7b7241 100644 --- a/src/couchdb/priv/Makefile.am +++ b/src/couchdb/priv/Makefile.am @@ -87,9 +87,9 @@ endif # libtool and automake have defeated markh. For each of our executables # we end up with 2 copies - one directly in the 'target' folder (eg, 'priv') -# and another - the correct one - in .libs. The former doesn't work but is +# and another - the correct one - in .libs. The former doesn't work but is # what gets installed for 'couchspawnkillable' - but the correct one for -# couchjs.exe *does* get copied. *shrug* So just clobber it with the +# couchjs.exe *does* get copied. *shrug* So just clobber it with the # correct one as the last step. See bug COUCHDB-439 install-data-hook: if test -f "$(DESTDIR)$(couchprivlibdir)/couch_icu_driver"; then \ @@ -98,9 +98,9 @@ install-data-hook: $(LN_S) couch_icu_driver couch_icu_driver.so; \ fi if WINDOWS - $(INSTALL) $(ICU_LOCAL_BIN)/icuuc44.dll $(bindir) - $(INSTALL) $(ICU_LOCAL_BIN)/icudt44.dll $(bindir) - $(INSTALL) $(ICU_LOCAL_BIN)/icuin44.dll $(bindir) + $(INSTALL) $(ICU_LOCAL_BIN)/icuuc*.dll $(bindir) + $(INSTALL) $(ICU_LOCAL_BIN)/icudt*.dll $(bindir) + $(INSTALL) $(ICU_LOCAL_BIN)/icuin*.dll $(bindir) $(INSTALL) $(JS_LIB_BINARY) $(bindir) $(INSTALL) .libs/couchspawnkillable.exe \ "$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"