You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ra...@apache.org on 2012/01/07 02:12:05 UTC
[3/3] git commit: COUCHDB-1152 remove icu version dependency (win)
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/1054f949
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1054f949
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1054f949
Branch: refs/heads/master
Commit: 1054f9493f89311dd23939d669bd2370552f2f93
Parents: e3651ec
Author: Randall Leeds <ra...@apache.org>
Authored: Fri Jan 6 17:09:30 2012 -0800
Committer: Randall Leeds <ra...@apache.org>
Committed: Fri Jan 6 17:09:30 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/1054f949/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 02f7a7f..704e870 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -90,9 +90,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 \
@@ -106,9 +106,9 @@ install-data-hook:
$(LN_S) couch_ejson_compare_nif couch_ejson_compare_nif.so; \
fi
if WINDOWS
- $(INSTALL) $(ICU_BIN)/icuuc44.dll $(bindir)
- $(INSTALL) $(ICU_BIN)/icudt44.dll $(bindir)
- $(INSTALL) $(ICU_BIN)/icuin44.dll $(bindir)
+ $(INSTALL) $(ICU_BIN)/icuuc*.dll $(bindir)
+ $(INSTALL) $(ICU_BIN)/icudt*.dll $(bindir)
+ $(INSTALL) $(ICU_BIN)/icuin*.dll $(bindir)
$(INSTALL) $(JS_LIB_BINARY) $(bindir)
$(INSTALL) .libs/couchspawnkillable.exe \
"$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"