[PATCH 2/3] Fix the wildcard usage in automake files.
David Shea
dshea at redhat.com
Thu Sep 12 19:22:30 UTC 2013
Fun fact: Automake doesn't support wildcards. There's a snitty chapter
about it in the manual and everything. However, in most cases we can
trick it into working right by specifying a directory with the wildcard.
---
data/command-stubs/Makefile.am | 2 +-
data/pixmaps/Makefile.am | 2 +-
pyanaconda/Makefile.am | 2 +-
pyanaconda/installclasses/Makefile.am | 2 +-
pyanaconda/isys/Makefile.am | 4 ++--
pyanaconda/packaging/Makefile.am | 2 +-
pyanaconda/ui/Makefile.am | 2 +-
pyanaconda/ui/gui/Makefile.am | 4 ++--
pyanaconda/ui/gui/categories/Makefile.am | 2 +-
pyanaconda/ui/gui/hubs/Makefile.am | 4 ++--
pyanaconda/ui/gui/spokes/Makefile.am | 4 ++--
pyanaconda/ui/gui/spokes/advstorage/Makefile.am | 4 ++--
pyanaconda/ui/gui/spokes/lib/Makefile.am | 4 ++--
pyanaconda/ui/lib/Makefile.am | 2 +-
pyanaconda/ui/tui/Makefile.am | 2 +-
pyanaconda/ui/tui/hubs/Makefile.am | 2 +-
pyanaconda/ui/tui/simpleline/Makefile.am | 2 +-
pyanaconda/ui/tui/spokes/Makefile.am | 2 +-
utils/log_picker/Makefile.am | 2 +-
utils/log_picker/sending/Makefile.am | 2 +-
widgets/data/tzmapdata/Makefile.am | 2 +-
21 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/data/command-stubs/Makefile.am b/data/command-stubs/Makefile.am
index cab5f89..2ad8511 100644
--- a/data/command-stubs/Makefile.am
+++ b/data/command-stubs/Makefile.am
@@ -18,6 +18,6 @@
# Author: David Cantrell <dcantrell at redhat.com>
commandstubsdir = $(datadir)/$(PACKAGE_NAME)
-dist_commandstubs_SCRIPTS = *-stub
+dist_commandstubs_SCRIPTS = $(srcdir)/*-stub
MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 26d1f77..2b95c4d 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -18,6 +18,6 @@
# Author: David Cantrell <dcantrell at redhat.com>
pixmapsdir = $(datadir)/$(PACKAGE_NAME)/pixmaps
-dist_pixmaps_DATA = *.png *.svg
+dist_pixmaps_DATA = $(srcdir)/*.png $(srcdir)/*.svg
MAINTAINERCLEANFILES = Makefile.in
diff --git a/pyanaconda/Makefile.am b/pyanaconda/Makefile.am
index 09b2b86..ae1159c 100644
--- a/pyanaconda/Makefile.am
+++ b/pyanaconda/Makefile.am
@@ -24,4 +24,4 @@ MAINTAINERCLEANFILES = Makefile.in
# anaconda Python code
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
anacondadir = $(pkgpyexecdir)
-anaconda_PYTHON = *.py
+anaconda_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/installclasses/Makefile.am b/pyanaconda/installclasses/Makefile.am
index d7bd1eb..4b80b20 100644
--- a/pyanaconda/installclasses/Makefile.am
+++ b/pyanaconda/installclasses/Makefile.am
@@ -19,6 +19,6 @@
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
installclassesdir = $(pkgpyexecdir)/installclasses
-installclasses_PYTHON = *.py
+installclasses_PYTHON = $(srcdir)/*.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/pyanaconda/isys/Makefile.am b/pyanaconda/isys/Makefile.am
index 8cdae2d..9ed177e 100644
--- a/pyanaconda/isys/Makefile.am
+++ b/pyanaconda/isys/Makefile.am
@@ -23,7 +23,7 @@ ISYS_SRCS = devices.c lang.c \
isofs.c linkdetect.c vio.c ethtool.c eddsupport.c iface.c \
auditd.c log.c mem.c
-dist_noinst_HEADERS = *.h
+dist_noinst_HEADERS = $(srcdir)/*.h
ISYS_CFLAGS = -DVERSION='"$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)"' \
$(NETWORKMANAGER_CFLAGS) $(LIBNL_CFLAGS) $(LIBNM_GLIB_CFLAGS) \
@@ -33,7 +33,7 @@ ISYS_LIBS = $(RESOLV_LIBS) $(ZLIB_LIBS) \
$(LIBNL_LIBS) $(LIBNM_GLIB_LIBS)
isysdir = $(pkgpyexecdir)/isys
-isys_PYTHON = *.py
+isys_PYTHON = $(srcdir)/*.py
pkgpyexec_LTLIBRARIES = _isys.la
_isys_la_CFLAGS = $(PYTHON_CFLAGS) $(ISYS_CFLAGS)
diff --git a/pyanaconda/packaging/Makefile.am b/pyanaconda/packaging/Makefile.am
index 77c6f41..ee5bcef 100644
--- a/pyanaconda/packaging/Makefile.am
+++ b/pyanaconda/packaging/Makefile.am
@@ -19,6 +19,6 @@
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
packagingdir = $(pkgpyexecdir)/packaging
-packaging_PYTHON = *.py
+packaging_PYTHON = $(srcdir)/*.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/pyanaconda/ui/Makefile.am b/pyanaconda/ui/Makefile.am
index 69051fa..ecb5b4c 100644
--- a/pyanaconda/ui/Makefile.am
+++ b/pyanaconda/ui/Makefile.am
@@ -21,4 +21,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
uidir = $(pkgpyexecdir)/ui
-ui_PYTHON = *.py
+ui_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/ui/gui/Makefile.am b/pyanaconda/ui/gui/Makefile.am
index 51d43a8..272cebb 100644
--- a/pyanaconda/ui/gui/Makefile.am
+++ b/pyanaconda/ui/gui/Makefile.am
@@ -21,7 +21,7 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
guidir = $(pkgpyexecdir)/ui/gui
-gui_PYTHON = *.py
+gui_PYTHON = $(srcdir)/*.py
uidir = $(datadir)/$(PACKAGE_NAME)/ui/
-dist_ui_DATA = *.glade
+dist_ui_DATA = $(srcdir)/*.glade
diff --git a/pyanaconda/ui/gui/categories/Makefile.am b/pyanaconda/ui/gui/categories/Makefile.am
index 7a799da..ed3ecee 100644
--- a/pyanaconda/ui/gui/categories/Makefile.am
+++ b/pyanaconda/ui/gui/categories/Makefile.am
@@ -19,4 +19,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
categoriesdir = $(pkgpyexecdir)/ui/gui/categories
-categories_PYTHON = *.py
+categories_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/ui/gui/hubs/Makefile.am b/pyanaconda/ui/gui/hubs/Makefile.am
index ae520a6..d6a87c4 100644
--- a/pyanaconda/ui/gui/hubs/Makefile.am
+++ b/pyanaconda/ui/gui/hubs/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
hubsdir = $(pkgpyexecdir)/ui/gui/hubs
-hubs_PYTHON = *.py
+hubs_PYTHON = $(srcdir)/*.py
uidir = $(datadir)/$(PACKAGE_NAME)/ui/hubs
-dist_ui_DATA = *.glade
+dist_ui_DATA = $(srcdir)/*.glade
diff --git a/pyanaconda/ui/gui/spokes/Makefile.am b/pyanaconda/ui/gui/spokes/Makefile.am
index a052dab..93d767a 100644
--- a/pyanaconda/ui/gui/spokes/Makefile.am
+++ b/pyanaconda/ui/gui/spokes/Makefile.am
@@ -21,7 +21,7 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
spokesdir = $(pkgpyexecdir)/ui/gui/spokes
-spokes_PYTHON = *.py
+spokes_PYTHON = $(srcdir)/*.py
uidir = $(datadir)/$(PACKAGE_NAME)/ui/spokes
-dist_ui_DATA = *.glade
+dist_ui_DATA = $(srcdir)/*.glade
diff --git a/pyanaconda/ui/gui/spokes/advstorage/Makefile.am b/pyanaconda/ui/gui/spokes/advstorage/Makefile.am
index bcad43c..c18d3dc 100644
--- a/pyanaconda/ui/gui/spokes/advstorage/Makefile.am
+++ b/pyanaconda/ui/gui/spokes/advstorage/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
spokesdir = $(pkgpyexecdir)/ui/gui/spokes/advstorage
-spokes_PYTHON = *.py
+spokes_PYTHON = $(srcdir)/*.py
uidir = $(datadir)/$(PACKAGE_NAME)/ui/spokes/advstorage
-dist_ui_DATA = *.glade
+dist_ui_DATA = $(srcdir)/*.glade
diff --git a/pyanaconda/ui/gui/spokes/lib/Makefile.am b/pyanaconda/ui/gui/spokes/lib/Makefile.am
index ecd597c..c872464 100644
--- a/pyanaconda/ui/gui/spokes/lib/Makefile.am
+++ b/pyanaconda/ui/gui/spokes/lib/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
spokesdir = $(pkgpyexecdir)/ui/gui/spokes/lib
-spokes_PYTHON = *.py
+spokes_PYTHON = $(srcdir)/*.py
uidir = $(datadir)/$(PACKAGE_NAME)/ui/spokes/lib
-dist_ui_DATA = *.glade
+dist_ui_DATA = $(srcdir)/*.glade
diff --git a/pyanaconda/ui/lib/Makefile.am b/pyanaconda/ui/lib/Makefile.am
index 5098c96..378a6a8 100644
--- a/pyanaconda/ui/lib/Makefile.am
+++ b/pyanaconda/ui/lib/Makefile.am
@@ -19,4 +19,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
commondir = $(pkgpyexecdir)/ui/lib
-common_PYTHON = *.py
+common_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/ui/tui/Makefile.am b/pyanaconda/ui/tui/Makefile.am
index 9cc0ba1..389638e 100644
--- a/pyanaconda/ui/tui/Makefile.am
+++ b/pyanaconda/ui/tui/Makefile.am
@@ -21,4 +21,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
tuidir = $(pkgpyexecdir)/ui/tui
-tui_PYTHON = *.py
+tui_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/ui/tui/hubs/Makefile.am b/pyanaconda/ui/tui/hubs/Makefile.am
index f099b76..ca18e8e 100644
--- a/pyanaconda/ui/tui/hubs/Makefile.am
+++ b/pyanaconda/ui/tui/hubs/Makefile.am
@@ -21,4 +21,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
hubsdir = $(pkgpyexecdir)/ui/tui/hubs
-hubs_PYTHON = *.py
+hubs_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/ui/tui/simpleline/Makefile.am b/pyanaconda/ui/tui/simpleline/Makefile.am
index 555931b..191995c 100644
--- a/pyanaconda/ui/tui/simpleline/Makefile.am
+++ b/pyanaconda/ui/tui/simpleline/Makefile.am
@@ -21,4 +21,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
simplelinedir = $(pkgpyexecdir)/ui/tui/simpleline
-simpleline_PYTHON = *.py
+simpleline_PYTHON = $(srcdir)/*.py
diff --git a/pyanaconda/ui/tui/spokes/Makefile.am b/pyanaconda/ui/tui/spokes/Makefile.am
index 96cdff9..505edcb 100644
--- a/pyanaconda/ui/tui/spokes/Makefile.am
+++ b/pyanaconda/ui/tui/spokes/Makefile.am
@@ -21,4 +21,4 @@ MAINTAINERCLEANFILES = Makefile.in
pkgpyexecdir = $(pyexecdir)/py$(PACKAGE_NAME)
spokesdir = $(pkgpyexecdir)/ui/tui/spokes
-spokes_PYTHON = *.py
+spokes_PYTHON = $(srcdir)/*.py
diff --git a/utils/log_picker/Makefile.am b/utils/log_picker/Makefile.am
index a3fb172..e9cb273 100644
--- a/utils/log_picker/Makefile.am
+++ b/utils/log_picker/Makefile.am
@@ -19,6 +19,6 @@ SUBDIRS = sending
pkgpyexecdir = $(pyexecdir)/log_picker
logpickerdir = $(pkgpyexecdir)
-logpicker_PYTHON = *.py
+logpicker_PYTHON = $(srcdir)/*.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/utils/log_picker/sending/Makefile.am b/utils/log_picker/sending/Makefile.am
index d898b3e..7f284b5 100644
--- a/utils/log_picker/sending/Makefile.am
+++ b/utils/log_picker/sending/Makefile.am
@@ -18,6 +18,6 @@
pkgpyexecdir = $(pyexecdir)/log_picker
sendingdir = $(pkgpyexecdir)/sending
-sending_PYTHON = *.py
+sending_PYTHON = $(srcdir)/*.py
MAINTAINERCLEANFILES = Makefile.in
diff --git a/widgets/data/tzmapdata/Makefile.am b/widgets/data/tzmapdata/Makefile.am
index 89f11fe..2dd6029 100644
--- a/widgets/data/tzmapdata/Makefile.am
+++ b/widgets/data/tzmapdata/Makefile.am
@@ -17,7 +17,7 @@
# Author: Vratislav Podzimek <vpodzime at redhat.com>
timezonemap_datadir = $(datadir)/anaconda/tzmapdata
-dist_timezonemap_data_DATA = *.png timezones_backward
+dist_timezonemap_data_DATA = $(srcdir)/*.png timezones_backward
MAINTAINERCLEANFILES = Makefile.in
--
1.8.3.1
More information about the anaconda-patches
mailing list