[Monotone-commits-diffs] net.venge.monotone: bc6a2479f4c8261b7a440a2f27feec77e61a678a

[code]

revision:            bc6a2479f4c8261b7a440a2f27feec77e61a678a
date:                2011-02-13T08:16:01
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
* Makefile.am (extradir, extra_prefix, extra_data, install-extra-data) 
  (uninstall-extra-data): Removed.  Some of the files in the 'extra'
  directory tree are installed through other mechanisms, others aren't
  supposed to be installed at all.  The conclusion here is that files
  from this directory tree should be installed individually, depending on
  need and what type of file it is.


manifest:
format_version "1"

new_manifest [b616bf8221ddc752591c4523bce7ca735125db08]

old_revision [00c6c5757b978dcaf09572e27f5753718f2a157b]

patch "Makefile.am"
 from [af80f35d6a5d9a54a2db2c94a35337399afd16a2]
   to [965b9830a2eb7b37d2543956964a4033ac83cb01]
============================================================
--- Makefile.am	af80f35d6a5d9a54a2db2c94a35337399afd16a2
+++ Makefile.am	965b9830a2eb7b37d2543956964a4033ac83cb01
@@ -324,10 +324,6 @@ endif
 
 # extra files
 
-extradir = $(docdir)/extra
-extra_prefix = extra
-extra_data = $(shell cd $(srcdir); find $(extra_prefix) | sed -e 's,^\./,,')
-
 contribdir = $(docdir)/contrib
 contrib_prefix = contrib
 contrib_data = $(shell cd $(srcdir); find $(contrib_prefix) | sed -e 's,^\./,,')
@@ -358,7 +354,7 @@ EXTRA_DIST =								\
 									\
 	src/package_revision.txt src/package_full_revision_dist.txt	\
 									\
-	mac notes visualc $(contrib_data) $(examples_data) $(extra_data)
+	mac notes visualc $(contrib_data) $(examples_data) extra
 
 # Message translation support
 # INST_LINGUAS is set by configure, based on the po/LINGUAS file and
@@ -489,11 +485,6 @@ _uninstall_data = \
 	  rmdir "$(DESTDIR)$(3)/$$to_rmdir" || exit $$?; \
 	done
 
-install-extra-data: $(extra_data)
-	@$(call _install_data,$(extra_data),$(extra_prefix),$(extradir))
-uninstall-extra-data:
-	@$(call _uninstall_data,$(extra_data),$(extra_prefix),$(extradir))
-
 install-contrib-data: $(contrib_data)
 	@$(call _install_data,$(contrib_data),$(contrib_prefix),$(contribdir))
 uninstall-contrib-data:
@@ -814,9 +805,9 @@ install-data-local: install-nls \
 # each of them, as dependencies.
 all-local: all-nls
 install-data-local: install-nls \
-	install-extra-data install-contrib-data install-examples-data
+	install-contrib-data install-examples-data
 uninstall-local: uninstall-nls \
-	uninstall-extra-data uninstall-contrib-data uninstall-examples-data
+	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