[Monotone-commits-diffs] net.venge.monotone: 9fa8e839780984c1028b5023f47d525066d99535

[code]

revision:            9fa8e839780984c1028b5023f47d525066d99535
date:                2011-02-23T08:47:21
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
* Makefile.am (mtnhooks_DATA): Rename to...
  (dist_mtnhooks_DATA): ... this, to make sure these files become part of
  the source distribution.
  (EXTRA_DIST): Remove doc/monotone.html, doc/images and doc/texinfo.css.
  They are taken care of by doc/Makefile.  Also, don't include the whole
  extra/ directory, as most of the files in there are handled through
  other variables and the rest shouldn't be part of the source
  distribution.  Only include the files that should be part of it and
  aren't mentioned anywhere else.
  (dist-nls): Move the code to clean out backup files...
  (dist-hook): ... here.
  (mtnopt): Use specific targets instead if %, as the latter may disturb
  the normal function of a generated Makefile.
  (extra/shell/monotone.bash_completion): Have it depend on Makefile as
  well, for good measure.

manifest:
format_version "1"

new_manifest [9da8c8ea139012a1f62d50995852188754222567]

old_revision [825fb474fa6321b257aa246e6129cfdd1c861e1a]

patch "Makefile.am"
 from [2d34a5a46bcc489c31a3f4bb7c895d7eb77e95c1]
   to [6e6a3f7aaecccc749e261d452d84bd8431ba6cb7]
============================================================
--- Makefile.am	2d34a5a46bcc489c31a3f4bb7c895d7eb77e95c1
+++ Makefile.am	6e6a3f7aaecccc749e261d452d84bd8431ba6cb7
@@ -249,7 +249,7 @@ mtnhooksdir = $(monotonedir)/hooks
 monotonedir = $(datadir)/monotone
 
 mtnhooksdir = $(monotonedir)/hooks
-mtnhooks_DATA = \
+dist_mtnhooks_DATA = \
 	extra/mtn-hooks/authorize_remote_automate.lua			\
 	extra/mtn-hooks/get_passphrase_from_file.lua			\
 	extra/mtn-hooks/monotone-ciabot.lua				\
@@ -357,8 +357,7 @@ EXTRA_DIST =								\
 	HACKING INSTALL INSTALL_windows_cygwin.txt			\
 	INSTALL_windows_native.txt README.visualc8 UPGRADE		\
 	util/audit-includes util/do-editor-vars.sh			\
-	$(wildcard $(srcdir)/m4/*.m4) doc/monotone.html doc/images	\
-	doc/texinfo.css src/schema.sql src/unix/README			\
+	$(wildcard $(srcdir)/m4/*.m4) src/schema.sql src/unix/README	\
 	src/util/mtnopt.in innosetup/README.txt				\
 	innosetup/monotone.iss.in innosetup/modpath.iss 		\
 	innosetup/monotone.bmp innosetup/dlls.sh			\
@@ -376,7 +375,11 @@ EXTRA_DIST =								\
 									\
 	src/package_revision.txt src/package_full_revision_dist.txt	\
 									\
-	mac notes visualc $(contrib_data) $(examples_data) extra
+	mac notes visualc $(contrib_data) $(examples_data)		\
+									\
+	extra/README extra/building/dump-test-logs.sh.in		\
+	extra/shell/monotone.bash_completion.in				\
+	extra/shell/monotone_gen_bash_completion_table.pl
 
 # Message translation support
 # INST_LINGUAS is set by configure, based on the po/LINGUAS file and
@@ -471,12 +474,6 @@ dist-nls: $(ALL_GMOFILES)
 
 dist-nls: $(ALL_GMOFILES)
 	cp $(ALL_GMOFILES) $(distdir)/po
-# also, kill off any backup files that got pulled in by one of the
-# recursive subdirectory includes in EXTRA_DIST
-# note use of slightly non-portable "-delete" action
-	find $(distdir) \( -name '*.bak' -o -name '*.orig' -o -name '*.rej' \
-	    -o -name '*~' -o -name '#*#' -o -name '*.swp' \) -delete
-
 else
 
 po/%.gmo: $(srcdir)/po/%.gmo
@@ -732,11 +729,12 @@ do_subst = sed -e 's,address@hidden
 do_subst = sed -e 's,address@hidden@],$(PACKAGE_VERSION),' \
 	-e 's,address@hidden@],$(sysconfdir),'
 
-%: src/util/%.in Makefile
+mtnopt: src/util/mtnopt.in Makefile
 	$(V_subst)$(do_subst) < $< > $@ && chmod +x $@
 
 extra/shell/monotone.bash_completion: extra/shell/monotone.bash_completion.in \
-	$(bin_PROGRAMS) extra/shell/monotone_gen_bash_completion_table.pl
+	$(bin_PROGRAMS) extra/shell/monotone_gen_bash_completion_table.pl \
+	Makefile
 	$(MKDIR_P) extra/shell
 	( sed -e '/address@hidden@]$$/,$$d' < $<; \
 	  MTN=./mtn$(EXEEXT) \
@@ -848,11 +846,17 @@ check-local: check-testers
 	uninstall-contrib-data uninstall-examples-data
 mostlyclean-local: mostlyclean-tests
 check-local: check-testers
+
 # All hooks supported by automake here, depending on all the things we want
 # to hook in.  This is to support multiple things into the same hook, as
 # dependencies.
+distcheck-hook: distcheck-base.hh
 dist-hook: dist-nls
-distcheck-hook: distcheck-base.hh
+# Kill off any backup files that got pulled in by one of the
+# recursive subdirectory includes in EXTRA_DIST
+# note use of slightly non-portable "-delete" action
+	find $(distdir) \( -name '*.bak' -o -name '*.orig' -o -name '*.rej' \
+	    -o -name '*~' -o -name '#*#' -o -name '*.swp' \) -delete
 
 mtn.1: mtn$(EXEEXT)
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \