From: Daniel Burrows <dburrows@debian.org>
Date: Sun, 20 Jun 2010 14:53:38 -0700
Subject: [PATCH] Uniformly use $(srcdir) when grabbing files for install using $(wildcard), so wildcarded files get picked up even if the build directory isn't the source directory.
 Most importantly, this means that translated defaults are available
 again. (Closes: #586508, #586511)

---
 Makefile.am        |    2 +-
 Makefile.in        |    2 +-
 doc/cs/Makefile.am |    2 +-
 doc/cs/Makefile.in |    2 +-
 doc/de/Makefile.am |    2 +-
 doc/de/Makefile.in |    2 +-
 doc/fi/Makefile.am |    2 +-
 doc/fi/Makefile.in |    2 +-
 doc/fr/Makefile.am |    2 +-
 doc/fr/Makefile.in |    2 +-
 doc/ja/Makefile.am |    2 +-
 doc/ja/Makefile.in |    2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 45bb716..bdaba09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ MANPAGE_LOCALES=gl it pl
 
 TLMANPAGES = $(wildcard $(srcdir)/aptitude.??.8)
 TLHELPTXTS = help.txt $(wildcard $(srcdir)/help-??.txt) $(wildcard $(srcdir)/help-??_??.txt)
-TLDEFAULTS = $(wildcard aptitude-defaults.??) $(wildcard aptitude-defaults.??_??)
+TLDEFAULTS = $(wildcard $(srcdir)/aptitude-defaults.??) $(wildcard $(srcdir)/aptitude-defaults.??_??)
 EXTRA_DIST = config.rpath  ChangeLog.SVN Doxyfile.in FAQ README.i18n README.SMART-POINTERS README.THREADS README.CWIDGET aptitude-hackers-guide.txt aclocal.m4 \
 	function_groups function_pkgs aptitude-defaults \
 	section-descriptions \
diff --git a/Makefile.in b/Makefile.in
index 3a59091..609c909 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -287,7 +287,7 @@ dist_bin_SCRIPTS = aptitude-create-state-bundle aptitude-run-state-bundle
 MANPAGE_LOCALES = gl it pl
 TLMANPAGES = $(wildcard $(srcdir)/aptitude.??.8)
 TLHELPTXTS = help.txt $(wildcard $(srcdir)/help-??.txt) $(wildcard $(srcdir)/help-??_??.txt)
-TLDEFAULTS = $(wildcard aptitude-defaults.??) $(wildcard aptitude-defaults.??_??)
+TLDEFAULTS = $(wildcard $(srcdir)/aptitude-defaults.??) $(wildcard $(srcdir)/aptitude-defaults.??_??)
 EXTRA_DIST = config.rpath  ChangeLog.SVN Doxyfile.in FAQ README.i18n README.SMART-POINTERS README.THREADS README.CWIDGET aptitude-hackers-guide.txt aclocal.m4 \
 	function_groups function_pkgs aptitude-defaults \
 	section-descriptions \
diff --git a/doc/cs/Makefile.am b/doc/cs/Makefile.am
index 0bd8d65..80833ba 100644
--- a/doc/cs/Makefile.am
+++ b/doc/cs/Makefile.am
@@ -17,7 +17,7 @@ MANPAGE=aptitude.$(LANGCODE).8
 
 HTML2TEXT=$(srcdir)/../html-to-text
 
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 
 all-local: doc-stamp
 
diff --git a/doc/cs/Makefile.in b/doc/cs/Makefile.in
index bc20739..39b46c3 100644
--- a/doc/cs/Makefile.in
+++ b/doc/cs/Makefile.in
@@ -242,7 +242,7 @@ localemandir = $(mandir)/$(LANGCODE)
 README = README.$(LANGCODE)
 MANPAGE = aptitude.$(LANGCODE).8
 HTML2TEXT = $(srcdir)/../html-to-text
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
index a9bfacb..bdc043b 100644
--- a/doc/de/Makefile.am
+++ b/doc/de/Makefile.am
@@ -19,7 +19,7 @@ htmldir=$(docdir)/html/$(LANGCODE)
 
 HTML2TEXT=$(srcdir)/../html-to-text
 
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 
 all-local: doc-stamp
 
diff --git a/doc/de/Makefile.in b/doc/de/Makefile.in
index 84f2567..0104c4c 100644
--- a/doc/de/Makefile.in
+++ b/doc/de/Makefile.in
@@ -248,7 +248,7 @@ README = README.$(LANGCODE)
 XMLSOURCES = aptitude.xml manpage.xml $(srcdir)/../aptitude-common.xsl
 localemandir = $(mandir)/$(LANGCODE)
 HTML2TEXT = $(srcdir)/../html-to-text
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/doc/fi/Makefile.am b/doc/fi/Makefile.am
index 3c92fe6..0356b30 100644
--- a/doc/fi/Makefile.am
+++ b/doc/fi/Makefile.am
@@ -16,7 +16,7 @@ README=README.$(LANGCODE)
 
 HTML2TEXT=$(srcdir)/../html-to-text
 
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 
 all-local: doc-stamp
 
diff --git a/doc/fi/Makefile.in b/doc/fi/Makefile.in
index ff99575..afc35fe 100644
--- a/doc/fi/Makefile.in
+++ b/doc/fi/Makefile.in
@@ -244,7 +244,7 @@ localemandir = $(mandir)/$(LANGCODE)
 # Automake automagically distributes README without asking..
 README = README.$(LANGCODE)
 HTML2TEXT = $(srcdir)/../html-to-text
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
index 2168dda..7fca073 100644
--- a/doc/fr/Makefile.am
+++ b/doc/fr/Makefile.am
@@ -9,7 +9,7 @@ MANPAGE=aptitude.$(LANGCODE).8
 PERCENT_TRANSLATED=45
 MANPAGE_PERCENT_TRANSLATED=30
 
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 
 HTML2TEXT=$(srcdir)/../html-to-text
 
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index 9fc3099..0157d63 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -242,7 +242,7 @@ MANPAGE = aptitude.$(LANGCODE).8
 # How much of the manual is actually translated.
 PERCENT_TRANSLATED = 45
 MANPAGE_PERCENT_TRANSLATED = 30
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 HTML2TEXT = $(srcdir)/../html-to-text
 localemandir = $(mandir)/$(LANGCODE)
 
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
index b403810..79991b3 100644
--- a/doc/ja/Makefile.am
+++ b/doc/ja/Makefile.am
@@ -18,7 +18,7 @@ docdir=$(datadir)/doc/$(PACKAGE)
 localemandir=$(mandir)/$(LANGCODE)
 htmldir=$(DESTDIR)$(docdir)/html/$(LANGCODE)
 
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 
 if USE_PO4A
 all-local: doc-stamp
diff --git a/doc/ja/Makefile.in b/doc/ja/Makefile.in
index 2dd463c..4c474d3 100644
--- a/doc/ja/Makefile.in
+++ b/doc/ja/Makefile.in
@@ -246,7 +246,7 @@ PERCENT_TRANSLATED = 30
 MANPAGE_PERCENT_TRANSLATED = 29
 HTML2TEXT = $(srcdir)/../html-to-text
 localemandir = $(mandir)/$(LANGCODE)
-IMAGES = $(wildcard images/*.png)
+IMAGES = $(wildcard $(srcdir)/images/*.png)
 all: all-recursive
 
 .SUFFIXES:
--