Browse files

Fixing make distcheck errors.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@805272 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent caeae66 commit b6947c0ba7c965de1614e491c37c8e0333de9e94 @davisp davisp committed Aug 18, 2009
Showing with 36 additions and 27 deletions.
  1. +4 −4 Makefile.am
  2. +6 −2 etc/couchdb/Makefile.am
  3. +1 −0 license.skip
  4. +1 −20 src/couchdb/Makefile.am
  5. +24 −1 src/couchdb/priv/Makefile.am
View
8 Makefile.am
@@ -49,11 +49,11 @@ cover: dev
dev: all
@echo "This command is intended for developers to use;"
@echo "it creates development ini files as well as a"
- @echo "$(top_srcdir)/tmp structure for development runtime files."
+ @echo "./tmp structure for development runtime files."
@echo "Use ./utils/run to launch CouchDB from the source tree."
- mkdir -p $(top_srcdir)/tmp/lib
- mkdir -p $(top_srcdir)/tmp/log
- mkdir -p $(top_srcdir)/tmp/run
+ mkdir -p ./tmp/lib
+ mkdir -p ./tmp/log
+ mkdir -p ./tmp/run
.PHONY: local-clean
local-clean: maintainer-clean
View
8 etc/couchdb/Makefile.am
@@ -56,8 +56,12 @@ default_dev.ini: default.ini.tpl
-e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
< $< > $@
-local_dev.ini:
- cp local.ini $@
+# Noah said to not specify local.ini but it borks
+# VPATH builds that make distcheck uses.
+local_dev.ini: local.ini
+ if test ! -f "$@"; then \
+ cp $< $@; \
+ fi
install-data-hook:
if test ! -f "$(DESTDIR)$(localconfdir)/local.ini"; then \
View
1 license.skip
@@ -55,6 +55,7 @@
^src/couchdb/Makefile
^src/couchdb/Makefile.in
^src/couchdb/*.o
+^src/couchdb/priv/.deps/*
^src/couchdb/priv/Makefile
^src/couchdb/priv/Makefile.in
^src/couchdb/priv/couchspawnkillable
View
21 src/couchdb/Makefile.am
@@ -39,15 +39,10 @@ couchjs_CFLAGS = $(CURL_CFLAGS)
couchjs_LDADD = $(CURL_LDFLAGS)
if WINDOWS
-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
+#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
@@ -206,26 +201,12 @@ couch.app: couch.app.tpl
%.beam: %.erl couch_db.hrl
$(ERLC) $(ERLC_FLAGS) ${TEST} $<;
-if !WINDOWS
-priv/couchspawnkillable: priv/couchspawnkillable.sh
- cp $< $@
-endif
-
install-data-hook:
if test -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver"; then \
rm -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver.so"; \
cd "$(DESTDIR)$(couchprivlibdir)" && \
$(LN_S) couch_erl_driver couch_erl_driver.so; \
fi
-if WINDOWS
-# 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
-# what gets installed for 'couchspawnkillable' - but the correct one for
-# couchjs.exe *does* get copied. *shrug* So just clobber it with the
-# correct one here... See bug COUCHDB-439
- $(INSTALL) priv/.libs/couchspawnkillable.exe "$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
-endif
uninstall-local:
if test -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver"; then \
View
25 src/couchdb/priv/Makefile.am
@@ -10,4 +10,27 @@
## License for the specific language governing permissions and limitations under
## the License.
-## This file intentionally left blank.
+couchprivdir = $(couchlibdir)/priv
+
+EXTRA_DIST = couchspawnkillable.sh
+
+couchpriv_PROGRAMS = couchspawnkillable
+if WINDOWS
+couchspawnkillable_SOURCES = couchspawnkillable_win.c
+endif
+
+if !WINDOWS
+couchspawnkillable: couchspawnkillable.sh
+ cp $< $@
+endif
+
+if WINDOWS
+install-data-hook:
+# 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
+# what gets installed for 'couchspawnkillable' - but the correct one for
+# couchjs.exe *does* get copied. *shrug* So just clobber it with the
+# correct one here... See bug COUCHDB-439
+ $(INSTALL) .libs/couchspawnkillable.exe "$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
+endif

0 comments on commit b6947c0

Please sign in to comment.