Merger with master

Author: knizhnik

.gitattributes

@@ -13,9 +13,7 @@ README.*	conflict-marker-size=32
 
 # Certain data files that contain special whitespace, and other special cases
 *.data						-whitespace
-*.svg						whitespace=-blank-at-eol
 contrib/pgcrypto/sql/pgp-armor.sql		whitespace=-blank-at-eol
-doc/bug.template				whitespace=space-before-tab,-blank-at-eof,blank-at-eol
 src/backend/catalog/sql_features.txt		whitespace=space-before-tab,blank-at-eof,-blank-at-eol
 
 # Test output files that contain extra whitespace

GNUmakefile.in

@@ -128,4 +128,7 @@ distcheck: dist
 	rm -rf $(distdir) $(dummy)
 	@echo "Distribution integrity checks out."
 
+cpluspluscheck: submake-generated-headers
+	$(top_srcdir)/src/tools/pginclude/cpluspluscheck $(top_srcdir) $(abs_top_builddir)
+
 .PHONY: dist distdir distcheck docs install-docs world check-world install-world installcheck-world

Makefile

@@ -33,7 +33,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
 	\
 	 if [ x"$${GMAKE+set}" = xset ]; then \
 	   echo "Using GNU make found at $${GMAKE}"; \
-	   unset MAKEFLAGS; unset MAKELEVEL; \
+	   unset MAKELEVEL; \
 	   $${GMAKE} $@ ; \
 	 else \
 	   echo "You must use GNU make to build PostgreSQL." ; \