From 483ab96a1bd6df30035dc2ae1a90b1b59c54ef75 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 8 Jun 2021 18:04:28 -0400 Subject: gnulib: define the path to gnulib's parent dir The current setting assumes that gnulib is only used by dirs immediately under the source root. Trying to build it two or more levels deep fails. Switch GNULIB_BUILDDIR to a relative GNULIB_PARENT_DIR so that it can be used to construct both the build & source paths. --- sim/common/ChangeLog | 5 +++++ sim/common/Make-common.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'sim') diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8f44658..5bf47a3 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2021-06-14 Mike Frysinger + + * Make-common.in (GNULIB_BUILDDIR): Rename to ... + (GNULIB_PARENT_DIR): ... this. Remove "gnulib" from value. + 2021-06-12 Mike Frysinger * Make-common.in (COMMON_OBJS_NAMES): Add portability.o. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 7a5bbc1..3dab9ca 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -41,8 +41,8 @@ srcroot = $(srcdir)/../.. srcsim = $(srcdir)/.. # Helper code from gnulib. -GNULIB_BUILDDIR = ../../gnulib -include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc +GNULIB_PARENT_DIR = ../.. +include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc prefix = @prefix@ exec_prefix = @exec_prefix@ -- cgit v1.1