diff options
| author | Ricardo Salveti <ricardo@foundries.io> | 2019-11-05 21:16:07 -0300 |
|---|---|---|
| committer | Ricardo Salveti <ricardo@foundries.io> | 2019-11-06 11:44:08 -0300 |
| commit | de8e0765a4a54f0367999f682ce4cc53bfaa60b0 (patch) | |
| tree | b19d07c082b5dd6d30a59f89d329fb1ddf6d2198 /Makefile-switchroot.am | |
| parent | 44988e6a773c03d45feded532fee78bfc64c2216 (diff) | |
| download | ostree-de8e0765a4a54f0367999f682ce4cc53bfaa60b0.tar.gz | |
Makefile: declare ostree_boot_SCRIPTS and append values
ostree_boot_SCRIPTS was being set on both Makefile-boot.am and
Makefile-switchroot.am, causing the first one to be replaced by the
other at the final Makefile, so declare as empty and append on both
places instead.
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Diffstat (limited to 'Makefile-switchroot.am')
| -rw-r--r-- | Makefile-switchroot.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am index ff44d4bc..b81b843f 100644 --- a/Makefile-switchroot.am +++ b/Makefile-switchroot.am @@ -42,7 +42,7 @@ if BUILDOPT_USE_STATIC_COMPILER # to get autotools to install this as an executable but without generating rules # to make it itself which we have specified manually. See # https://lists.gnu.org/archive/html/help-gnu-utils/2007-01/msg00007.html -ostree_boot_SCRIPTS = ostree-prepare-root +ostree_boot_SCRIPTS += ostree-prepare-root ostree-prepare-root : $(ostree_prepare_root_SOURCES) $(STATIC_COMPILER) -o $@ -static $(top_srcdir)/src/switchroot/ostree-prepare-root.c $(ostree_prepare_root_CPPFLAGS) $(AM_CFLAGS) $(DEFAULT_INCLUDES) -DOSTREE_PREPARE_ROOT_STATIC=1 |