fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-05 22:48:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure glib subdir is configure before dist

Browse source 
We want to distribute the glib subdir, but we want to avoid configuring
it for the default build case where the system glib is used. Override
the standard dist target so that we can reconfigure with
--with-internal-glib if necessary. I think the target should be
compatible with the original dist.

This is pretty hacky and may need to be reverted if it breaks dist.
This commit is contained in:
Dan Nicholson 2012-04-12 05:37:22 -07:00
parent c74da521af
commit 1860fc8036
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -48,3 +48,13 @@ pkg_config_SOURCES= \
parse.c \
main.c
DISTCHECK_CONFIGURE_FLAGS = --with-installed-popt --with-internal-glib
# Override the normal dist so that we can make sure the glib subdir is
# configured first. Otherwise it will just bomb entering the directory.
dist dist-all: check-glib-Makefile
@$(MAKE) $(AM_MAKEFLAGS) dist-gzip
check-glib-Makefile:
@if test ! -f glib/Makefile; then \
echo $(SHELL) $(top_srcdir)/configure --with-internal-glib; \
$(SHELL) $(top_srcdir)/configure --with-internal-glib; \
fi