Conflicts:

	solenv/bin/modules/installer/download.pm

 Introduces:
 --enable-extra-gallery  - for additional galleries
 --enable-extra-template - for additional templates
 --enable-extra-sample   - for additional samples
 --enable-extra-font     - for additional fonts
 configure options.

As the hang seems to be causes by the code messing around in extension
help file directories, of which there are lots in a multi-lingual
build for at least the presenter-screen extension, just build en-US
extension help for now.

Why such a change is needed both here and in
sdext/source/presenter/makefile.mk (see commit
c2a7a6c055cf586b627268d38fd85cde2048db3d in the "extensions" repo) I
don't know, but that's how it seemed in my testing.

the gid_Brand_File* definitions broke non-en_US builds

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

libpython2.6.so symlink was not created, so pyuno was not able to find the
internal libpython2.6.so.1.0

This reverts commit ff2fec6aac243bb3ea7380709212454c3bedcc18.

it was to long; version is enough

This reverts commit bdbd0385f6972f49a5e954cebb342263f3666c7d.
It is not longer needed after the previous fix.

the check for versioned install dir (fdo#30837) broke creation of
languagepack on Windows and MAC; it is because ooodownloadfilename
was defined only for linux; we still need lang-specific directory
for other archs

Move unxlng.mk to unxgcc.mk and use that on OpenBSD and Linux
too as a default and then overwrite or add variables.

Should fix fdo#30797.

Conflicts:
	instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
	instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
	solenv/inc/minor.mk

- Add /usr/local/{bin,sbin} as last to find genbrk,
  genccode and gencmn.
- Add more directories to qt_libdir and qt_incdir
- Make sure find libqt-mt.so and libDCOP.so with
  a library major and minor in the filename where
  the .so does not exists, but foo.so.0.0 does.

Conflicts:
	solenv/inc/minor.mk

grab the compiler version explicitly in unxlng.mk
(cherry picked from commit b3611ba2d74d6b36c9f7758801b4f774b0b013bb)