build: use top_srcdir consistently
Signed-off-by: Ran Benita <ran234@gmail.com>
This commit is contained in:
1 parent
4983dbcf43
commit
4309735de3
3 files changed
+4
-4
No files matched your search
+2
-2
@@ -103,7 +103,7 @@ libxkbcommon_la_SOURCES = \
|
||||
src/utils.c \
|
||||
src/utils.h
|
||||
if HAVE_VERSION_SCRIPT
|
||||
libxkbcommon_la_LDFLAGS = -Wl,--version-script=${srcdir}/xkbcommon.map
|
||||
libxkbcommon_la_LDFLAGS = -Wl,--version-script=${top_srcdir}/xkbcommon.map
|
||||
endif HAVE_VERSION_SCRIPT
|
||||
|
||||
if ENABLE_X11
|
||||
@@ -119,7 +119,7 @@ libxkbcommon_x11_la_CFLAGS = $(AM_CFLAGS) $(XCB_XKB_CFLAGS)
|
||||
libxkbcommon_x11_la_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
libxkbcommon_x11_la_LIBADD = libxkbcommon.la $(XCB_XKB_LIBS)
|
||||
if HAVE_VERSION_SCRIPT
|
||||
libxkbcommon_x11_la_LDFLAGS = -Wl,--version-script=${srcdir}/xkbcommon-x11.map
|
||||
libxkbcommon_x11_la_LDFLAGS = -Wl,--version-script=${top_srcdir}/xkbcommon-x11.map
|
||||
endif HAVE_VERSION_SCRIPT
|
||||
|
||||
libxkbcommon_x11_la_SOURCES = \
|
||||
|
||||
+1
-1
@@ -97,7 +97,7 @@ openbsd*)
|
||||
esac
|
||||
AM_CONDITIONAL([HAVE_NO_UNDEFINED], [test "x$have_no_undefined" = xyes])
|
||||
|
||||
XORG_CHECK_LINKER_FLAGS([-Wl,--version-script="$srcdir/xkbcommon.map"], [have_version_script=yes])
|
||||
XORG_CHECK_LINKER_FLAGS([-Wl,--version-script="$top_srcdir/xkbcommon.map"], [have_version_script=yes])
|
||||
AM_CONDITIONAL([HAVE_VERSION_SCRIPT], [test "x$have_version_script" = xyes])
|
||||
|
||||
AC_CHECK_LIB(rt, clock_gettime,
|
||||
|
||||
+1
-1
@@ -159,7 +159,7 @@ test_get_path(const char *path_rel)
|
||||
{
|
||||
char *path;
|
||||
size_t path_len;
|
||||
const char *srcdir = getenv("srcdir");
|
||||
const char *srcdir = getenv("top_srcdir");
|
||||
|
||||
path_len = strlen(srcdir ? srcdir : ".") +
|
||||
strlen(path_rel ? path_rel : "") + 12;
|
||||
|
||||
Reference in new issue
Block a user