You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2009/08/18 04:30:00 UTC
svn commit: r805260 - /couchdb/trunk/src/couchdb/Makefile.am
Author: davisp
Date: Tue Aug 18 02:29:59 2009
New Revision: 805260
URL: http://svn.apache.org/viewvc?rev=805260&view=rev
Log:
The real fix for the make install issue. Autotools FTL
Modified:
couchdb/trunk/src/couchdb/Makefile.am
Modified: couchdb/trunk/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/Makefile.am?rev=805260&r1=805259&r2=805260&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/Makefile.am (original)
+++ couchdb/trunk/src/couchdb/Makefile.am Tue Aug 18 02:29:59 2009
@@ -39,19 +39,20 @@
couchjs_LDADD = $(CURL_LDFLAGS)
if WINDOWS
-priv_couchspawnkillable_win_SOURCES = priv/couchspawnkillable_win.c
-couchpriv_PROGRAMS = priv/couchspawnkillable_win
+priv_couchspawnkillable_SOURCES = priv/couchspawnkillable_win.c
+couchpriv_PROGRAMS = priv/couchspawnkillable
couch_erl_driver_la_LDFLAGS += -no-undefined
# copy ICU dlls for the erlang driver
dist_couch_erl_driver_la_DATA=$(ICU_LOCAL_BIN)/icuuc42.dll $(ICU_LOCAL_BIN)/icudt42.dll $(ICU_LOCAL_BIN)/icuin42.dll
couch_erl_driver_ladir=$(bindir)
+else
+couchpriv_PROGRAMS=priv/couchspawnkillable
endif
couchinclude_DATA = couch_db.hrl
couchebin_DATA = $(compiled_files)
-couchpriv_DATA = priv/couchspawnkillable
# dist_devdoc_DATA = $(doc_base) $(doc_modules)
@@ -205,10 +206,7 @@
%.beam: %.erl couch_db.hrl
$(ERLC) $(ERLC_FLAGS) ${TEST} $<;
-if WINDOWS
-priv/couchspawnkillable: priv/couchspawnkillable_win
- cp $< $@
-else
+if !WINDOWS
priv/couchspawnkillable: priv/couchspawnkillable.sh
cp $< $@
endif