Merge branch 'rj/maint-simplify-cygwin-makefile' into maint

* rj/maint-simplify-cygwin-makefile: Makefile: merge two Cygwin configuration sections into one