diff options
| author | Randall Leeds <randall@apache.org> | 2012-01-06 17:09:30 -0800 |
|---|---|---|
| committer | Randall Leeds <randall@apache.org> | 2012-01-06 17:09:30 -0800 |
| commit | 1054f9493f89311dd23939d669bd2370552f2f93 (patch) | |
| tree | dca6f6f79798a9efc74bfc332af54d567f75884f | |
| parent | e3651ec5d1c7e2ed75d9e70a2e71bb657eba751d (diff) | |
| download | couchdb-1054f9493f89311dd23939d669bd2370552f2f93.tar.gz | |
COUCHDB-1152 remove icu version dependency (win)
Patch by Dave Cottlehuber.
| -rw-r--r-- | src/couchdb/priv/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am index 02f7a7ff0..704e8708d 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" |