Merge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c'

* commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c':
  build: Add missing config.sh dependency for pkg-config files

Merged-by: James Almer <jamrial@gmail.com>

diff --cc configure
index 2a625ffce7d8a33e4a8337c5d2111c0e52a3e43b,1f220c8befe44058543e45f2a73a19f0341bf468..2f026c45bc49954d15c7cde72a22c9db806144e3
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -6983,10 -5385,9 +6983,10 @@@ print_enabled_components libavformat/pr
  
  # 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
  prefix=$prefix
  libdir=$libdir
  incdir=$incdir
@@@ -7007,5 -5405,7 +7007,7 @@@ EO
  
  for lib in $LIBRARY_LIST; do
      lib_deps="$(eval echo \$${lib}_deps)"
 -    echo ${lib}_deps=\"$lib_deps\" >> avbuild/config.sh
 +    echo ${lib}_deps=\"$lib_deps\" >> ffbuild/config.sh
  done
 -cp_if_changed $TMPH avbuild/config.sh
+ 
++cp_if_changed $TMPH ffbuild/config.sh

diff --cc ffbuild/library.mak
index 069079f5e7b71d258cfc7639ce55e146363155b1,81778b7ad1e948361b2d46667b6824c8e13b9222..612bacb9800605ba42abf3d96708884b55e6c843
--- 1/ffbuild/library.mak
--- 2/avbuild/library.mak
+++ b/ffbuild/library.mak
@@@ -37,10 -37,10 +37,10 @@@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.
        $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS)
  
  $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR)
 -      $$(M) $$(SRC_PATH)/avbuild/libversion.sh $(NAME) $$< > $$@
 +      $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@
  
- $(SUBDIR)lib$(FULLNAME).pc: $(SUBDIR)version.h | $(SUBDIR)
 -$(SUBDIR)lib$(NAME).pc: $(SUBDIR)version.h avbuild/config.sh | $(SUBDIR)
 -      $$(M) $$(SRC_PATH)/avbuild/pkgconfig_generate.sh $(NAME) "$(DESC)"
++$(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)
        $$(M)sed 's/MAJOR/$(lib$(NAME)_VERSION_MAJOR)/' $$< | $(VERSION_SCRIPT_POSTPROCESS_CMD) > $$@