Merge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c'

* commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c': build: Add missing config.sh dependency for pkg-config files Merged-by: James Almer <[email protected]>
ldts · Nov 12, 2017 · ccf7bca · ccf7bca
2 parents e0087a5 + 17b6c7e
commit ccf7bca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/configure b/configure
@@ -6983,7 +6983,7 @@ print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $
 
 # Settings for pkg-config files
 
-cat > ffbuild/config.sh <<EOF
+cat > $TMPH <<EOF
 # Automatically generated by configure - do not modify!
 shared=$shared
 build_suffix=$build_suffix
@@ -7009,3 +7009,5 @@ for lib in $LIBRARY_LIST; do
     lib_deps="$(eval echo \$${lib}_deps)"
     echo ${lib}_deps=\"$lib_deps\" >> ffbuild/config.sh
 done
+
+cp_if_changed $TMPH ffbuild/config.sh
diff --git a/ffbuild/library.mak b/ffbuild/library.mak
@@ -39,7 +39,7 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
 $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR)
 	$$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@
 
-$(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR)
+$(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h ffbuild/config.sh | $(SUBDIR)
 	$$(M) $$(SRC_PATH)/ffbuild/pkgconfig_generate.sh $(NAME) "$(DESC)"
 
 $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)