[pisa-src] r2119 - trunk/Makefile.am
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Wed, 10 Mar 2010 17:22:57 +0100
Author: biurrun
Date: Wed Mar 10 17:22:57 2010
New Revision: 2119
Log:
Fix 'make dist' with out-of-tree builds.
When the $(wildcard) Make function is (mis)used to generate lists of files
to include in dist tarballs it is necessary to specify the full path to
those files, i.e. to prefix them with the source path.
Modified:
trunk/Makefile.am
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Wed Mar 10 16:48:08 2010 (r2118)
+++ trunk/Makefile.am Wed Mar 10 17:22:57 2010 (r2119)
@@ -6,34 +6,36 @@
# The tools/ subdirectory cannot be directly included because then
# distcleancheck has trouble building the C files below tools/.
# FIXME: For some reason symlinked directories in openwrt/ get skipped.
-EXTRA_DIST = INSTALL \
- LICENSE \
- $(wildcard community-operator/*.cfg) \
- $(wildcard community-operator/*.h) \
- community-operator/README \
- community-operator/TODO \
- docs \
- $(wildcard libpisa/*.h) \
- openwrt \
- $(wildcard pairing/*.cfg) \
- $(wildcard pairing/*.h) \
- $(wildcard pairing/*.txt) \
- pairing/defaults \
- pairing/pisaum \
- $(wildcard pisacd/*.h) \
- $(wildcard pisacd/*.sh) \
- $(wildcard pisasd/*.h) \
- $(wildcard pisasd/*.sh) \
- $(wildcard tools/*.cfg) \
- $(wildcard tools/*.conf) \
- $(wildcard tools/*.output) \
- $(wildcard tools/*.pl) \
- $(wildcard tools/*.sh) \
- tools/convenience-scripts \
- tools/packaging \
- tools/screenrc \
- tools/subversion \
- tools/tunnel
+EXTRA_DIST_WILDCARDS = community-operator/*.cfg \
+ community-operator/*.h \
+ libpisa/*.h \
+ pairing/*.cfg \
+ pairing/*.h \
+ pairing/*.txt \
+ pisacd/*.h \
+ pisacd/*.sh \
+ pisasd/*.h \
+ pisasd/*.sh \
+ tools/*.cfg \
+ tools/*.conf \
+ tools/*.output \
+ tools/*.pl \
+ tools/*.sh
+
+EXTRA_DIST = INSTALL \
+ LICENSE \
+ community-operator/README \
+ community-operator/TODO \
+ docs \
+ openwrt \
+ pairing/defaults \
+ pairing/pisaum \
+ tools/convenience-scripts \
+ tools/packaging \
+ tools/screenrc \
+ tools/subversion \
+ tools/tunnel \
+ $(wildcard $(addprefix $(srcdir)/,$(EXTRA_DIST_WILDCARDS)))
dist_sysconf_DATA = pisacd/pisacd.conf \
pisacd/pisacd.startup \
Other related posts:
- » [pisa-src] r2119 - trunk/Makefile.am - Diego Biurrun
