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)

6 files changed, 6 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index 45bb716d..bdaba09d 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/doc/cs/Makefile.am b/doc/cs/Makefile.am
index 0bd8d653..80833ba5 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/de/Makefile.am b/doc/de/Makefile.am
index a9bfacbb..bdc043b8 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/fi/Makefile.am b/doc/fi/Makefile.am
index 3c92fe6c..0356b30c 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/fr/Makefile.am b/doc/fr/Makefile.am
index 2168ddab..7fca073f 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/ja/Makefile.am b/doc/ja/Makefile.am
index b4038101..79991b31 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