From 2652d5a16d80bb4156b1d6df1b6922ba3d9e423c Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Tue, 18 Aug 2009 02:29:59 +0000
Subject: The real fix for the make install issue. Autotools FTL

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@805260 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/Makefile.am | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/couchdb')

diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index f495a2c7..9c3a5f68 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -39,19 +39,20 @@ couchjs_CFLAGS = $(CURL_CFLAGS)
 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 @@ couch.app: couch.app.tpl
 %.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
-- 
cgit v1.2.3