mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-09-05 23:48:44 +02:00
Fix make install with --disable-installed-tests
If installed tests are not enabled, installed_testdir is not defined, so we end up trying to create /modules and to chmod things in /x-content/, which is not right.
This commit is contained in:
@@ -7,16 +7,27 @@ LDADD = \
|
||||
$(top_builddir)/glib/libglib-2.0.la \
|
||||
$(NULL)
|
||||
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
$(gio_INCLUDES) $(GLIB_DEBUG_FLAGS) \
|
||||
-I$(top_builddir)/gio \
|
||||
-I$(top_srcdir)/gio
|
||||
-I$(top_srcdir)/gio \
|
||||
$(NULL)
|
||||
|
||||
modules = \
|
||||
libtestmodulea.la \
|
||||
libtestmoduleb.la \
|
||||
$(NULL)
|
||||
|
||||
if ENABLE_ALWAYS_BUILD_TESTS
|
||||
noinst_LTLIBRARIES = $(modules)
|
||||
else
|
||||
check_LTLIBRARIES = $(modules)
|
||||
endif
|
||||
|
||||
if ENABLE_INSTALLED_TESTS
|
||||
testmoduledir = $(installed_testdir)/modules
|
||||
testmodule_LTLIBRARIES = \
|
||||
libtestmodulea.la \
|
||||
libtestmoduleb.la
|
||||
testmodule_LTLIBRARIES = $(modules)
|
||||
endif
|
||||
|
||||
libtestmodulea_la_SOURCES = test-module-a.c
|
||||
libtestmodulea_la_LIBADD = $(LDADD)
|
||||
|
Reference in New Issue
Block a user