Merge branch 'maint' into branch-1.11

* maint:
  install: don't create empty dirs when an empty 'foo_PRIMARY' is used

diff --cc NEWS
index 51776d1,5d463da..c71ef84
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -215,9 -171,27 +215,30 @@@ Bugs fixed in 1.11.2
  
  * Long-standing bugs:
  
 +  - The order of Yacc and Lex flags is fixed to be consistent with other
 +    languages: $(AM_YFLAGS) comes before $(YFLAGS), and $(AM_LFLAGS) before
 +    $(LFLAGS), so that the user variables override the developer variables.
+   - An empty declaration of a "foo_PRIMARY" don't cause anymore the
+     generated install rules to create an empty $(foodir) directory;
+     for example, if Makefile.am contains something like:
+ 
+       pkglibexec_SCRIPTS =
+       if FALSE
+       pkglibexec_SCRIPTS += bar.sh
+       endif
+ 
+     the $(pkglibexec) directory will not be created upon "make install".
+ 
+   - It is now possible for a foo_SOURCES variable to hold Vala sources
+     together with C header files, as well as with sources and headers for
+     other supported languages (e.g., C++).  Previously, only mixing C and
+     Vala sources was supported.
+ 
+   - Vala support now works better in VPATH setups.
+ 
+   - The "deleted header file problem" for *.am files is avoided by stub
+     rules.  This allows `make' to trigger a rerun of `automake' also if
+     some previously needed `.am' file has been removed.
  
    - "make distcheck" now correctly complains also when "make uninstall"
      leaves one and only one file installed in $(prefix).