Skip to contentSkip to conversation

packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

PATCH New Thomas De Schampheleire 4 participants 47 messages Sep 27, 2014 – Oct 5, 2014 Page 2 of 2

Subsystems (5)
lore
Share & tools
lore
#40 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 12 lines

This patch series renames the various FOO_BAR_OPT variables into FOO_BAR_OPTS, to increase consistency between the various infrastructures (generic vs other infras specifically).
In particular, this solves an issue detected while introducing kconfig-package. See the description of the MAKE_OPT patch for details.

To help detecting usage of the old variables, checks are added that error out early.

OPTS was chosen over OPT, as it is more logical (more than one option), and since TARGET_CONFIGURE_OPTS etc. already existed.

Quoted 7 lines

Changes in v2:
- mostly rebasing
- add sed commands used for the replacement, for easier review (Yann)
- reorder patches and fold the check-adding-patches into one
- add two patches that fix the indentation issues caused by the renaming

This is rebased against commit 6f5bffc426f7418c555291450d482a0ceede0865.

Thanks for the respin, I'm reviewing that now. Ideally I should finish tonight.

I think this series should be applied very soon, to avoid the rebase hell if new packages are to be added.

BTW, I've marked your old series as superseded in Patchwork. ;-)

Regards,
Yann E. MORIN.

Quoted 693 lines

---
Thomas De Schampheleire (15)
packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
pkg-generic: introduce helper function to check for a deprecated variable
pkg-generic: add checks on deprecated variables FOO_BAR_OPT
packages: rename misc. occurrences of _OPT into _OPTS
.mk files: remove alignment of line continuation characters .mk files: remove alignment of assignments

 boot/at91bootstrap3/at91bootstrap3.mk                                                        |    4 +-
 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk                                            |   12 +-
 boot/grub/grub.mk                                                                            |    6 +-
 boot/grub2/grub2.mk                                                                          |    4 +-
 boot/gummiboot/gummiboot.mk                                                                  |    2 +-
 boot/lpc32xxcdl/lpc32xxcdl.mk                                                                |    8 +-
 boot/mxs-bootlets/mxs-bootlets.mk                                                            |    2 +-
 boot/syslinux/syslinux.mk                                                                    |    4 +-
 boot/uboot/uboot.mk                                                                          |   50 +-
 boot/xloader/xloader.mk                                                                      |    4 +-
 docs/manual/adding-packages-autotools.txt                                                    |   14 +-
 docs/manual/adding-packages-cmake.txt                                                        |   10 +-
 docs/manual/adding-packages-kconfig.txt                                                      |    4 +-
 docs/manual/adding-packages-luarocks.txt                                                     |    6 +-
 docs/manual/adding-packages-perl.txt                                                         |    8 +-
 docs/manual/adding-packages-python.txt                                                       |   20 +-
 docs/manual/writing-rules.txt                                                                |    8 +-
 fs/ext2/ext2.mk                                                                              |    2 +-
 linux/linux-ext-rtai.mk                                                                      |   10 +-
 linux/linux-ext-xenomai.mk                                                                   |    6 +-
 linux/linux.mk                                                                               |   14 +-
 package/acl/acl.mk                                                                           |   16 +-
 package/agentpp/agentpp.mk                                                                   |    2 +-
 package/alsa-lib/alsa-lib.mk                                                                 |   30 +-
 package/alsa-utils/alsa-utils.mk                                                             |    4 +-
 package/apitrace/apitrace.mk                                                                 |    2 +-
 package/apr-util/apr-util.mk                                                                 |    2 +-
 package/at/at.mk                                                                             |    2 +-
 package/atftp/atftp.mk                                                                       |   12 +-
 package/atk/atk.mk                                                                           |    4 +-
 package/attr/attr.mk                                                                         |   16 +-
 package/audiofile/audiofile.mk                                                               |    6 +-
 package/aumix/aumix.mk                                                                       |    2 +-
 package/avahi/avahi.mk                                                                       |   22 +-
 package/bandwidthd/bandwidthd.mk                                                             |   10 +-
 package/bash/bash.mk                                                                         |    4 +-
 package/bcusdk/bcusdk.mk                                                                     |    2 +-
 package/beecrypt/beecrypt.mk                                                                 |    4 +-
 package/bind/bind.mk                                                                         |   24 +-
 package/binutils/binutils.mk                                                                 |   10 +-
 package/blackbox/blackbox.mk                                                                 |    2 +-
 package/bluez5_utils/bluez5_utils.mk                                                         |   30 +-
 package/bluez_utils/bluez_utils.mk                                                           |   30 +-
 package/bmon/bmon.mk                                                                         |    4 +-
 package/boost/boost.mk                                                                       |   14 +-
 package/bootutils/bootutils.mk                                                               |    2 +-
 package/bridge-utils/bridge-utils.mk                                                         |    2 +-
 package/busybox/busybox.mk                                                                   |    2 +-
 package/bwm-ng/bwm-ng.mk                                                                     |    4 +-
 package/cairo/cairo.mk                                                                       |   58 +-
 package/ccache/ccache.mk                                                                     |    6 +-
 package/cdrkit/cdrkit.mk                                                                     |   12 +-
 package/cegui06/cegui06.mk                                                                   |   44 +-
 package/celt051/celt051.mk                                                                   |   26 +-
 package/chrony/chrony.mk                                                                     |   10 +-
 package/cifs-utils/cifs-utils.mk                                                             |    2 +-
 package/civetweb/civetweb.mk                                                                 |   10 +-
 package/cjson/cjson.mk                                                                       |   10 +-
 package/clapack/clapack.mk                                                                   |    4 +-
 package/classpath/classpath.mk                                                               |   24 +-
 package/cloog/cloog.mk                                                                       |    2 +-
 package/collectd/collectd.mk                                                                 |   12 +-
 package/connman/connman.mk                                                                   |   16 +-
 package/copas/copas.mk                                                                       |    2 +-
 package/coreutils/coreutils.mk                                                               |    2 +-
 package/coxpcall/coxpcall.mk                                                                 |    2 +-
 package/cppcms/cppcms.mk                                                                     |    4 +-
 package/cppdb/cppdb.mk                                                                       |    2 +-
 package/ctorrent/ctorrent.mk                                                                 |    4 +-
 package/cups/cups.mk                                                                         |   18 +-
 package/cvs/cvs.mk                                                                           |    2 +-
 package/cwiid/cwiid.mk                                                                       |    6 +-
 package/dbus-cpp/dbus-cpp.mk                                                                 |   12 +-
 package/dbus-glib/dbus-glib.mk                                                               |    4 +-
 package/dbus-python/dbus-python.mk                                                           |    2 +-
 package/dbus/dbus.mk                                                                         |   16 +-
 package/dhcp/dhcp.mk                                                                         |    6 +-
 package/dhcpcd/dhcpcd.mk                                                                     |    8 +-
 package/dhcpdump/dhcpdump.mk                                                                 |    2 +-
 package/dialog/dialog.mk                                                                     |    4 +-
 package/dillo/dillo.mk                                                                       |   16 +-
 package/directfb/directfb.mk                                                                 |   56 +-
 package/distcc/distcc.mk                                                                     |    2 +-
 package/dmalloc/dmalloc.mk                                                                   |   10 +-
 package/dmidecode/dmidecode.mk                                                               |    2 +-
 package/dmraid/dmraid.mk                                                                     |    2 +-
 package/dnsmasq/dnsmasq.mk                                                                   |   12 +-
 package/dropbear/dropbear.mk                                                                 |    8 +-
 package/dtc/dtc.mk                                                                           |   22 +-
 package/duma/duma.mk                                                                         |    4 +-
 package/dvbsnoop/dvbsnoop.mk                                                                 |    8 +-
 package/e2fsprogs/e2fsprogs.mk                                                               |    6 +-
 package/ecryptfs-utils/ecryptfs-utils.mk                                                     |   18 +-
 package/ed/ed.mk                                                                             |    2 +-
 package/efl/libecore/libecore.mk                                                             |   46 +-
 package/efl/libedbus/libedbus.mk                                                             |   12 +-
 package/efl/libedje/libedje.mk                                                               |    8 +-
 package/efl/libeet/libeet.mk                                                                 |    4 +-
 package/efl/libelementary/libelementary.mk                                                   |    6 +-
 package/efl/libethumb/libethumb.mk                                                           |    2 +-
 package/efl/libevas-generic-loaders/libevas-generic-loaders.mk                               |    6 +-
 package/efl/libevas/libevas.mk                                                               |   90 +-
 package/eigen/eigen.mk                                                                       |    2 +-
 package/elf2flt/elf2flt.mk                                                                   |    2 +-
 package/elfutils/elfutils.mk                                                                 |   18 +-
 package/enlightenment/enlightenment.mk                                                       |   26 +-
 package/enscript/enscript.mk                                                                 |    4 +-
 package/erlang/erlang.mk                                                                     |   16 +-
 package/eudev/eudev.mk                                                                       |   22 +-
 package/evemu/evemu.mk                                                                       |    6 +-
 package/expat/expat.mk                                                                       |    4 +-
 package/expect/expect.mk                                                                     |    4 +-
 package/faifa/faifa.mk                                                                       |    2 +-
 package/fbdump/fbdump.mk                                                                     |    4 +-
 package/fetchmail/fetchmail.mk                                                               |    2 +-
 package/ffmpeg/ffmpeg.mk                                                                     |  152 +-
 package/flac/flac.mk                                                                         |   10 +-
 package/flann/flann.mk                                                                       |    2 +-
 package/flickcurl/flickcurl.mk                                                               |    2 +-
 package/flite/flite.mk                                                                       |    4 +-
 package/fltk/fltk.mk                                                                         |    8 +-
 package/fluxbox/fluxbox.mk                                                                   |    6 +-
 package/fontconfig/fontconfig.mk                                                             |    4 +-
 package/foomatic-filters/foomatic-filters.mk                                                 |    6 +-
 package/freerdp/freerdp.mk                                                                   |   28 +-
 package/freescale-imx/freescale-imx.mk                                                       |    2 +-
 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk                                   |    4 +-
 package/freescale-imx/imx-lib/imx-lib.mk                                                     |    2 +-
 package/freescale-imx/imx-vpu/imx-vpu.mk                                                     |    2 +-
 package/freetype/freetype.mk                                                                 |   18 +-
 package/gamin/gamin.mk                                                                       |    4 +-
 package/gcc/gcc-final/gcc-final.mk                                                           |   22 +-
 package/gcc/gcc-initial/gcc-initial.mk                                                       |   12 +-
 package/gcc/gcc.mk                                                                           |   52 +-
 package/gd/gd.mk                                                                             |   40 +-
 package/gdb/gdb.mk                                                                           |   28 +-
 package/gdk-pixbuf/gdk-pixbuf.mk                                                             |   12 +-
 package/genimage/genimage.mk                                                                 |   10 +-
 package/genpart/genpart.mk                                                                   |    8 +-
 package/gettext/gettext.mk                                                                   |    6 +-
 package/giblib/giblib.mk                                                                     |    2 +-
 package/git/git.mk                                                                           |   34 +-
 package/glib-networking/glib-networking.mk                                                   |    4 +-
 package/glibc/glibc.mk                                                                       |    6 +-
 package/gmpc/gmpc.mk                                                                         |    2 +-
 package/gnupg/gnupg.mk                                                                       |   12 +-
 package/gnupg2/gnupg2.mk                                                                     |    2 +-
 package/gnuplot/gnuplot.mk                                                                   |   10 +-
 package/gnutls/gnutls.mk                                                                     |   14 +-
 package/google-breakpad/google-breakpad.mk                                                   |    2 +-
 package/gpm/gpm.mk                                                                           |    2 +-
 package/grantlee/grantlee.mk                                                                 |    2 +-
 package/grep/grep.mk                                                                         |    4 +-
 package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk                                                   |   40 +-
 package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk                                         |    4 +-
 package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk                                         |    2 +-
 package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk                                         |  366 ++++----
 package/gstreamer/gst-plugins-base/gst-plugins-base.mk                                       |   98 +-
 package/gstreamer/gst-plugins-good/gst-plugins-good.mk                                       |  234 ++--
 package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk                                       |   46 +-
 package/gstreamer/gstreamer/gstreamer.mk                                                     |    2 +-
 package/gstreamer1/gst-omx/gst-omx.mk                                                        |    4 +-
 package/gstreamer1/gst1-libav/gst1-libav.mk                                                  |   46 +-
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk                                      |  394 +++++-----
 package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk                                    |  102 +-
 package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk                                    |  246 +++---
 package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk                                    |   42 +-
 package/gstreamer1/gstreamer1/gstreamer1.mk                                                  |    2 +-
 package/gtest/gtest.mk                                                                       |    2 +-
 package/gtk2-engines/gtk2-engines.mk                                                         |    2 +-
 package/gutenprint/gutenprint.mk                                                             |    4 +-
 package/gvfs/gvfs.mk                                                                         |   38 +-
 package/harfbuzz/harfbuzz.mk                                                                 |   18 +-
 package/haserl/haserl.mk                                                                     |    4 +-
 package/heimdal/heimdal.mk                                                                   |    2 +-
 package/heirloom-mailx/heirloom-mailx.mk                                                     |    4 +-
 package/hiawatha/hiawatha.mk                                                                 |    6 +-
 package/hplip/hplip.mk                                                                       |    6 +-
 package/htop/htop.mk                                                                         |    2 +-
 package/httping/httping.mk                                                                   |    6 +-
 package/icu/icu.mk                                                                           |    4 +-
 package/ifplugd/ifplugd.mk                                                                   |    4 +-
 package/igh-ethercat/igh-ethercat.mk                                                         |   18 +-
 package/imagemagick/imagemagick.mk                                                           |   42 +-
 package/imlib2/imlib2.mk                                                                     |   26 +-
 package/input-tools/input-tools.mk                                                           |    4 +-
 package/iperf/iperf.mk                                                                       |    2 +-
 package/ipmitool/ipmitool.mk                                                                 |    2 +-
 package/ipsec-tools/ipsec-tools.mk                                                           |   32 +-
 package/ipset/ipset.mk                                                                       |    2 +-
 package/iptables/iptables.mk                                                                 |    2 +-
 package/iputils/iputils.mk                                                                   |    6 +-
 package/irda-utils/irda-utils.mk                                                             |    2 +-
 package/iw/iw.mk                                                                             |    6 +-
 package/jack2/jack2.mk                                                                       |    6 +-
 package/jamvm/jamvm.mk                                                                       |    2 +-
 package/joe/joe.mk                                                                           |    4 +-
 package/jpeg-turbo/jpeg-turbo.mk                                                             |    6 +-
 package/json-c/json-c.mk                                                                     |    2 +-
 package/kbd/kbd.mk                                                                           |    2 +-
 package/kexec/kexec.mk                                                                       |    4 +-
 package/keyutils/keyutils.mk                                                                 |   20 +-
 package/kismet/kismet.mk                                                                     |    2 +-
 package/kmod/kmod.mk                                                                         |   14 +-
 package/knock/knock.mk                                                                       |    2 +-
 package/lame/lame.mk                                                                         |    4 +-
 package/lbase64/lbase64.mk                                                                   |    2 +-
 package/lbreakout2/lbreakout2.mk                                                             |    8 +-
 package/lcdproc/lcdproc.mk                                                                   |    4 +-
 package/lcms2/lcms2.mk                                                                       |   14 +-
 package/lesstif/lesstif.mk                                                                   |    4 +-
 package/lftp/lftp.mk                                                                         |   12 +-
 package/libao/libao.mk                                                                       |    6 +-
 package/libarchive/libarchive.mk                                                             |   32 +-
 package/libargtable2/libargtable2.mk                                                         |    2 +-
 package/libass/libass.mk                                                                     |   12 +-
 package/libassuan/libassuan.mk                                                               |    2 +-
 package/libatasmart/libatasmart.mk                                                           |    2 +-
 package/libbluray/libbluray.mk                                                               |    4 +-
 package/libcap-ng/libcap-ng.mk                                                               |    2 +-
 package/libcdio/libcdio.mk                                                                   |    6 +-
 package/libcec/libcec.mk                                                                     |    4 +-
 package/libcgicc/libcgicc.mk                                                                 |    2 +-
 package/libcgroup/libcgroup.mk                                                               |    6 +-
 package/libconfig/libconfig.mk                                                               |    4 +-
 package/libconfuse/libconfuse.mk                                                             |    2 +-
 package/libcurl/libcurl.mk                                                                   |   14 +-
 package/libdaemon/libdaemon.mk                                                               |    2 +-
 package/libdnet/libdnet.mk                                                                   |   10 +-
 package/libdrm/libdrm.mk                                                                     |   36 +-
 package/libdvdnav/libdvdnav.mk                                                               |    2 +-
 package/libeXosip2/libeXosip2.mk                                                             |    6 +-
 package/libedit/libedit.mk                                                                   |    2 +-
 package/libexif/libexif.mk                                                                   |    2 +-
 package/libffi/libffi.mk                                                                     |    2 +-
 package/libftdi/libftdi.mk                                                                   |    6 +-
 package/libfuse/libfuse.mk                                                                   |    2 +-
 package/libgail/libgail.mk                                                                   |    2 +-
 package/libgcrypt/libgcrypt.mk                                                               |    2 +-
 package/libglib2/libglib2.mk                                                                 |   14 +-
 package/libgpgme/libgpgme.mk                                                                 |    2 +-
 package/libgtk2/libgtk2.mk                                                                   |   22 +-
 package/libhid/libhid.mk                                                                     |    2 +-
 package/libidn/libidn.mk                                                                     |    2 +-
 package/libinput/libinput.mk                                                                 |    2 +-
 package/libjson/libjson.mk                                                                   |   12 +-
 package/libksba/libksba.mk                                                                   |    2 +-
 package/liblockfile/liblockfile.mk                                                           |    2 +-
 package/liblog4c-localtime/liblog4c-localtime.mk                                             |    2 +-
 package/liblogging/liblogging.mk                                                             |    6 +-
 package/libmad/libmad.mk                                                                     |    2 +-
 package/libmbim/libmbim.mk                                                                   |    6 +-
 package/libmemcached/libmemcached.mk                                                         |    2 +-
 package/libmicrohttpd/libmicrohttpd.mk                                                       |    8 +-
 package/libmpeg2/libmpeg2.mk                                                                 |    6 +-
 package/libndp/libndp.mk                                                                     |    2 +-
 package/libnfc/libnfc.mk                                                                     |    6 +-
 package/libnftnl/libnftnl.mk                                                                 |    8 +-
 package/libnl/libnl.mk                                                                       |    4 +-
 package/libnspr/libnspr.mk                                                                   |   10 +-
 package/liboauth/liboauth.mk                                                                 |    2 +-
 package/liboping/liboping.mk                                                                 |    2 +-
 package/libosip2/libosip2.mk                                                                 |    2 +-
 package/libpcap/libpcap.mk                                                                   |   14 +-
 package/libphidget/libphidget.mk                                                             |    2 +-
 package/libplayer/libplayer.mk                                                               |   12 +-
 package/libpng/libpng.mk                                                                     |    2 +-
 package/libpthsem/libpthsem.mk                                                               |    4 +-
 package/libqmi/libqmi.mk                                                                     |    6 +-
 package/libqrencode/libqrencode.mk                                                           |    6 +-
 package/libraw/libraw.mk                                                                     |    2 +-
 package/libreplaygain/libreplaygain.mk                                                       |    2 +-
 package/libroxml/libroxml.mk                                                                 |    2 +-
 package/librsvg/librsvg.mk                                                                   |    2 +-
 package/librtlsdr/librtlsdr.mk                                                               |    4 +-
 package/libsamplerate/libsamplerate.mk                                                       |    2 +-
 package/libseccomp/libseccomp.mk                                                             |   18 +-
 package/libsecret/libsecret.mk                                                               |    6 +-
 package/libsoc/libsoc.mk                                                                     |    2 +-
 package/libsoup/libsoup.mk                                                                   |    8 +-
 package/libsoxr/libsoxr.mk                                                                   |    8 +-
 package/libssh2/libssh2.mk                                                                   |   10 +-
 package/libstrophe/libstrophe.mk                                                             |    2 +-
 package/libsvg-cairo/libsvg-cairo.mk                                                         |   12 +-
 package/libsvg/libsvg.mk                                                                     |   14 +-
 package/libtheora/libtheora.mk                                                               |    2 +-
 package/libtirpc/libtirpc.mk                                                                 |    2 +-
 package/libtorrent/libtorrent.mk                                                             |    2 +-
 package/libubox/libubox.mk                                                                   |    4 +-
 package/libuci/libuci.mk                                                                     |    4 +-
 package/libungif/libungif.mk                                                                 |    8 +-
 package/liburcu/liburcu.mk                                                                   |    4 +-
 package/libusb/libusb.mk                                                                     |    6 +-
 package/libv4l/libv4l.mk                                                                     |    8 +-
 package/libva-intel-driver/libva-intel-driver.mk                                             |    8 +-
 package/libva/libva.mk                                                                       |   18 +-
 package/libvncserver/libvncserver.mk                                                         |   16 +-
 package/libvorbis/libvorbis.mk                                                               |    2 +-
 package/libvpx/libvpx.mk                                                                     |    4 +-
 package/libwebsockets/libwebsockets.mk                                                       |    4 +-
 package/libxml2/libxml2.mk                                                                   |   12 +-
 package/libxmlrpc/libxmlrpc.mk                                                               |    2 +-
 package/libxslt/libxslt.mk                                                                   |    6 +-
 package/lighttpd/lighttpd.mk                                                                 |   26 +-
 package/linknx/linknx.mk                                                                     |   10 +-
 package/links/links.mk                                                                       |   10 +-
 package/linphone/linphone.mk                                                                 |    6 +-
 package/linux-firmware/linux-firmware.mk                                                     |   62 +-
 package/linux-fusion/linux-fusion.mk                                                         |    2 +-
 package/linux-pam/linux-pam.mk                                                               |    4 +-
 package/linux-zigbee/linux-zigbee.mk                                                         |    8 +-
 package/lite/lite.mk                                                                         |    2 +-
 package/ljlinenoise/ljlinenoise.mk                                                           |    2 +-
 package/lm-sensors/lm-sensors.mk                                                             |   12 +-
 package/lmbench/lmbench.mk                                                                   |    2 +-
 package/localedef/localedef.mk                                                               |    6 +-
 package/log4cxx/log4cxx.mk                                                                   |    2 +-
 package/lpty/lpty.mk                                                                         |    2 +-
 package/lrandom/lrandom.mk                                                                   |    2 +-
 package/lrzsz/lrzsz.mk                                                                       |    2 +-
 package/lshw/lshw.mk                                                                         |    6 +-
 package/lsqlite3/lsqlite3.mk                                                                 |    2 +-
 package/ltp-testsuite/ltp-testsuite.mk                                                       |    4 +-
 package/ltrace/ltrace.mk                                                                     |    6 +-
 package/ltris/ltris.mk                                                                       |    4 +-
 package/lttng-babeltrace/lttng-babeltrace.mk                                                 |    4 +-
 package/lttng-libust/lttng-libust.mk                                                         |    6 +-
 package/lttng-modules/lttng-modules.mk                                                       |    4 +-
 package/lttng-tools/lttng-tools.mk                                                           |   10 +-
 package/lua-coat/lua-coat.mk                                                                 |    2 +-
 package/lua-coatpersistent/lua-coatpersistent.mk                                             |    2 +-
 package/lua-csnappy/lua-csnappy.mk                                                           |    2 +-
 package/lua-ev/lua-ev.mk                                                                     |    2 +-
 package/lua-messagepack/lua-messagepack.mk                                                   |    2 +-
 package/lua-testmore/lua-testmore.mk                                                         |    2 +-
 package/luabitop/luabitop.mk                                                                 |    2 +-
 package/luajit/luajit.mk                                                                     |    4 +-
 package/luajson/luajson.mk                                                                   |    2 +-
 package/lualogging/lualogging.mk                                                             |    2 +-
 package/luaposix/luaposix.mk                                                                 |    2 +-
 package/luarocks/luarocks.mk                                                                 |    8 +-
 package/luasec/luasec.mk                                                                     |    2 +-
 package/luasocket/luasocket.mk                                                               |    2 +-
 package/luasql-sqlite3/luasql-sqlite3.mk                                                     |    2 +-
 package/lunit/lunit.mk                                                                       |    2 +-
 package/lvm2/lvm2.mk                                                                         |   14 +-
 package/lxc/lxc.mk                                                                           |    2 +-
 package/lzlib/lzlib.mk                                                                       |    2 +-
 package/lzma/lzma.mk                                                                         |    2 +-
 package/m4/m4.mk                                                                             |    2 +-
 package/madplay/madplay.mk                                                                   |    2 +-
 package/matchbox/matchbox-common/matchbox-common.mk                                          |    2 +-
 package/matchbox/matchbox-desktop/matchbox-desktop.mk                                        |    6 +-
 package/matchbox/matchbox-fakekey/matchbox-fakekey.mk                                        |    2 +-
 package/matchbox/matchbox-keyboard/matchbox-keyboard.mk                                      |    2 +-
 package/matchbox/matchbox-lib/matchbox-lib.mk                                                |   18 +-
 package/matchbox/matchbox-panel/matchbox-panel.mk                                            |    6 +-
 package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk                        |    2 +-
 package/matchbox/matchbox-wm/matchbox-wm.mk                                                  |    8 +-
 package/mcrypt/mcrypt.mk                                                                     |    2 +-
 package/mdadm/mdadm.mk                                                                       |    4 +-
 package/media-ctl/media-ctl.mk                                                               |    2 +-
 package/mediastreamer/mediastreamer.mk                                                       |   42 +-
 package/memcached/memcached.mk                                                               |    2 +-
 package/mesa3d/mesa3d.mk                                                                     |   42 +-
 package/metacity/metacity.mk                                                                 |    2 +-
 package/midori/midori.mk                                                                     |    6 +-
 package/mii-diag/mii-diag.mk                                                                 |   10 +-
 package/minidlna/minidlna.mk                                                                 |    2 +-
 package/mmc-utils/mmc-utils.mk                                                               |    2 +-
 package/modem-manager/modem-manager.mk                                                       |    8 +-
 package/monit/monit.mk                                                                       |   10 +-
 package/mpd/mpd.mk                                                                           |   90 +-
 package/mpdecimal/mpdecimal.mk                                                               |    2 +-
 package/mpfr/mpfr.mk                                                                         |    2 +-
 package/mpg123/mpg123.mk                                                                     |   14 +-
 package/mplayer/mplayer.mk                                                                   |   10 +-
 package/msmtp/msmtp.mk                                                                       |    8 +-
 package/mtd/mtd.mk                                                                           |   76 +-
 package/mtools/mtools.mk                                                                     |    2 +-
 package/mtr/mtr.mk                                                                           |    2 +-
 package/musepack/musepack.mk                                                                 |    2 +-
 package/mutt/mutt.mk                                                                         |   18 +-
 package/mxml/mxml.mk                                                                         |    4 +-
 package/mysql/mysql.mk                                                                       |   12 +-
 package/nano/nano.mk                                                                         |    4 +-
 package/nbd/nbd.mk                                                                           |    2 +-
 package/ncurses/ncurses.mk                                                                   |    8 +-
 package/ndisc6/ndisc6.mk                                                                     |    2 +-
 package/ne10/ne10.mk                                                                         |    4 +-
 package/neard/neard.mk                                                                       |    4 +-
 package/neon/neon.mk                                                                         |   20 +-
 package/netatalk/netatalk.mk                                                                 |   12 +-
 package/netperf/netperf.mk                                                                   |    2 +-
 package/netsnmp/netsnmp.mk                                                                   |   20 +-
 package/nettle/nettle.mk                                                                     |    8 +-
 package/network-manager/network-manager.mk                                                   |   20 +-
 package/newt/newt.mk                                                                         |    2 +-
 package/nfs-utils/nfs-utils.mk                                                               |    6 +-
 package/ngrep/ngrep.mk                                                                       |    2 +-
 package/nmap/nmap.mk                                                                         |    8 +-
 package/nss-mdns/nss-mdns.mk                                                                 |    2 +-
 package/ntfs-3g/ntfs-3g.mk                                                                   |    8 +-
 package/ntp/ntp.mk                                                                           |   10 +-
 package/nut/nut.mk                                                                           |   34 +-
 package/ofono/ofono.mk                                                                       |   10 +-
 package/ola/ola.mk                                                                           |   74 +-
 package/omniorb/omniorb.mk                                                                   |    8 +-
 package/on2-8170-modules/on2-8170-modules.mk                                                 |    2 +-
 package/open2300/open2300.mk                                                                 |    6 +-
 package/opencv/opencv.mk                                                                     |  188 ++--
 package/openntpd/openntpd.mk                                                                 |    2 +-
 package/openobex/openobex.mk                                                                 |   10 +-
 package/openocd/openocd.mk                                                                   |   16 +-
 package/openpowerlink/openpowerlink.mk                                                       |   38 +-
 package/openssh/openssh.mk                                                                   |    6 +-
 package/openswan/openswan.mk                                                                 |   12 +-
 package/openvmtools/openvmtools.mk                                                           |   16 +-
 package/openvpn/openvpn.mk                                                                   |   10 +-
 package/opkg/opkg.mk                                                                         |    6 +-
 package/oprofile/oprofile.mk                                                                 |    2 +-
 package/opus-tools/opus-tools.mk                                                             |    8 +-
 package/opus/opus.mk                                                                         |    4 +-
 package/orbit/orbit.mk                                                                       |    2 +-
 package/ortp/ortp.mk                                                                         |    2 +-
 package/p11-kit/p11-kit.mk                                                                   |    2 +-
 package/pango/pango.mk                                                                       |    6 +-
 package/parted/parted.mk                                                                     |   12 +-
 package/pcmanfm/pcmanfm.mk                                                                   |    2 +-
 package/pcre/pcre.mk                                                                         |   12 +-
 package/pcsc-lite/pcsc-lite.mk                                                               |   10 +-
 package/perl-gd/perl-gd.mk                                                                   |    2 +-
 package/perl-xml-libxml/perl-xml-libxml.mk                                                   |    2 +-
 package/perl-xml-parser/perl-xml-parser.mk                                                   |    2 +-
 package/perl/perl.mk                                                                         |   16 +-
 package/php-geoip/php-geoip.mk                                                               |    2 +-
 package/php-gnupg/php-gnupg.mk                                                               |    2 +-
 package/php-imagick/php-imagick.mk                                                           |    2 +-
 package/php-memcached/php-memcached.mk                                                       |    2 +-
 package/php-ssh2/php-ssh2.mk                                                                 |    2 +-
 package/php-yaml/php-yaml.mk                                                                 |    2 +-
 package/php-zmq/php-zmq.mk                                                                   |    2 +-
 package/php/php.mk                                                                           |   68 +-
 package/picocom/picocom.mk                                                                   |    2 +-
 package/pinentry/pinentry.mk                                                                 |   24 +-
 package/pixman/pixman.mk                                                                     |    4 +-
 package/pkg-autotools.mk                                                                     |   32 +-
 package/pkg-cmake.mk                                                                         |   30 +-
 package/pkg-generic.mk                                                                       |   87 +-
 package/pkg-kconfig.mk                                                                       |    6 +-
 package/pkg-luarocks.mk                                                                      |   14 +-
 package/pkg-perl.mk                                                                          |   26 +-
 package/pkg-python.mk                                                                        |   70 +-
 package/pkg-utils.mk                                                                         |   22 +-
 package/poco/poco.mk                                                                         |   44 +-
 package/polarssl/polarssl.mk                                                                 |    2 +-
 package/polkit/polkit.mk                                                                     |    2 +-
 package/poppler/poppler.mk                                                                   |   30 +-
 package/popt/popt.mk                                                                         |    2 +-
 package/portaudio/portaudio.mk                                                               |    2 +-
 package/postgresql/postgresql.mk                                                             |   12 +-
 package/powerpc-utils/powerpc-utils.mk                                                       |    2 +-
 package/pppd/pppd.mk                                                                         |    8 +-
 package/prboom/prboom.mk                                                                     |    2 +-
 package/procps-ng/procps-ng.mk                                                               |    4 +-
 package/proftpd/proftpd.mk                                                                   |    4 +-
 package/protobuf-c/protobuf-c.mk                                                             |    2 +-
 package/protobuf/protobuf.mk                                                                 |    2 +-
 package/psmisc/psmisc.mk                                                                     |    2 +-
 package/ptpd2/ptpd2.mk                                                                       |    4 +-
 package/pulseaudio/pulseaudio.mk                                                             |   18 +-
 package/pv/pv.mk                                                                             |    2 +-
 package/python-dialog/python-dialog.mk                                                       |    4 +-
 package/python-ipy/python-ipy.mk                                                             |    2 +-
 package/python-netifaces/python-netifaces.mk                                                 |    4 +-
 package/python-numpy/python-numpy.mk                                                         |    2 +-
 package/python-protobuf/python-protobuf.mk                                                   |    4 +-
 package/python-pyparsing/python-pyparsing.mk                                                 |   12 +-
 package/python-pyro/python-pyro.mk                                                           |    4 +-
 package/python-serial/python-serial.mk                                                       |    4 +-
 package/python-setuptools/python-setuptools.mk                                               |    4 +-
 package/python/python.mk                                                                     |   86 +-
 package/python3/python3.mk                                                                   |   66 +-
 package/qemu/qemu.mk                                                                         |   16 +-
 package/qextserialport/qextserialport.mk                                                     |    4 +-
 package/qjson/qjson.mk                                                                       |    2 +-
 package/qt/qt.mk                                                                             |   76 +-
 package/qt5/qt5base/qt5base.mk                                                               |   50 +-
 package/quagga/quagga.mk                                                                     |   28 +-
 package/quota/quota.mk                                                                       |    4 +-
 package/qwt/qwt.mk                                                                           |    2 +-
 package/rdesktop/rdesktop.mk                                                                 |    4 +-
 package/rings/rings.mk                                                                       |    2 +-
 package/rp-pppoe/rp-pppoe.mk                                                                 |    4 +-
 package/rpcbind/rpcbind.mk                                                                   |    6 +-
 package/rpi-userland/rpi-userland.mk                                                         |    2 +-
 package/rpm/rpm.mk                                                                           |   16 +-
 package/rrdtool/rrdtool.mk                                                                   |    2 +-
 package/rsync/rsync.mk                                                                       |    4 +-
 package/rsyslog/rsyslog.mk                                                                   |    6 +-
 package/rt-tests/rt-tests.mk                                                                 |   12 +-
 package/rtai/rtai.mk                                                                         |   12 +-
 package/rubix/rubix.mk                                                                       |    4 +-
 package/ruby/ruby.mk                                                                         |    8 +-
 package/sam-ba/sam-ba.mk                                                                     |    4 +-
 package/samba/samba.mk                                                                       |   18 +-
 package/samba4/samba4.mk                                                                     |   32 +-
 package/sane-backends/sane-backends.mk                                                       |    8 +-
 package/schifra/schifra.mk                                                                   |    4 +-
 package/sconeserver/sconeserver.mk                                                           |   56 +-
 package/scons/scons.mk                                                                       |    2 +-
 package/screen/screen.mk                                                                     |    2 +-
 package/sdl/sdl.mk                                                                           |   22 +-
 package/sdl_gfx/sdl_gfx.mk                                                                   |    6 +-
 package/sdl_image/sdl_image.mk                                                               |    4 +-
 package/sdl_mixer/sdl_mixer.mk                                                               |   10 +-
 package/sdl_net/sdl_net.mk                                                                   |    2 +-
 package/sdl_sound/sdl_sound.mk                                                               |    6 +-
 package/sdl_ttf/sdl_ttf.mk                                                                   |    4 +-
 package/sed/sed.mk                                                                           |    2 +-
 package/setserial/setserial.mk                                                               |    2 +-
 package/sg3_utils/sg3_utils.mk                                                               |    2 +-
 package/shared-mime-info/shared-mime-info.mk                                                 |    4 +-
 package/sispmctl/sispmctl.mk                                                                 |    2 +-
 package/slang/slang.mk                                                                       |   16 +-
 package/slirp/slirp.mk                                                                       |    8 +-
 package/smcroute/smcroute.mk                                                                 |    2 +-
 package/snmppp/snmppp.mk                                                                     |    6 +-
 package/socat/socat.mk                                                                       |    4 +-
 package/socketcand/socketcand.mk                                                             |    2 +-
 package/sox/sox.mk                                                                           |   30 +-
 package/spawn-fcgi/spawn-fcgi.mk                                                             |    2 +-
 package/speex/speex.mk                                                                       |    8 +-
 package/spice-protocol/spice-protocol.mk                                                     |   10 +-
 package/spice/spice.mk                                                                       |   50 +-
 package/sqlcipher/sqlcipher.mk                                                               |    6 +-
 package/sqlite/sqlite.mk                                                                     |   12 +-
 package/squashfs/squashfs.mk                                                                 |   16 +-
 package/squid/squid.mk                                                                       |    6 +-
 package/startup-notification/startup-notification.mk                                         |    2 +-
 package/stress/stress.mk                                                                     |    2 +-
 package/strongswan/strongswan.mk                                                             |   86 +-
 package/stunnel/stunnel.mk                                                                   |    2 +-
 package/subversion/subversion.mk                                                             |    2 +-
 package/sudo/sudo.mk                                                                         |    2 +-
 package/swig/swig.mk                                                                         |    2 +-
 package/sylpheed/sylpheed.mk                                                                 |    6 +-
 package/synergy/synergy.mk                                                                   |    2 +-
 package/sysstat/sysstat.mk                                                                   |    6 +-
 package/systemd/systemd.mk                                                                   |   48 +-
 package/sysvinit/sysvinit.mk                                                                 |    6 +-
 package/taglib/taglib.mk                                                                     |    4 +-
 package/tcl/tcl.mk                                                                           |    4 +-
 package/tcllib/tcllib.mk                                                                     |   12 +-
 package/tcpdump/tcpdump.mk                                                                   |    2 +-
 package/tcpreplay/tcpreplay.mk                                                               |    2 +-
 package/tftpd/tftpd.mk                                                                       |   10 +-
 package/thrift/thrift.mk                                                                     |   12 +-
 package/tiff/tiff.mk                                                                         |   26 +-
 package/tn5250/tn5250.mk                                                                     |    6 +-
 package/torsmo/torsmo.mk                                                                     |    2 +-
 package/transmission/transmission.mk                                                         |   22 +-
 package/tslib/tslib.mk                                                                       |    2 +-
 package/tstools/tstools.mk                                                                   |    4 +-
 package/tvheadend/tvheadend.mk                                                               |   22 +-
 package/tz/tz.mk                                                                             |   18 +-
 package/tzdata/tzdata.mk                                                                     |   18 +-
 package/uboot-tools/uboot-tools.mk                                                           |   30 +-
 package/uclibc/uclibc.mk                                                                     |    2 +-
 package/udisks/udisks.mk                                                                     |   24 +-
 package/ulogd/ulogd.mk                                                                       |    8 +-
 package/urg/urg.mk                                                                           |    4 +-
 package/usbmount/usbmount.mk                                                                 |    4 +-
 package/usbredir/usbredir.mk                                                                 |   16 +-
 package/usbutils/usbutils.mk                                                                 |    2 +-
 package/util-linux/util-linux.mk                                                             |   18 +-
 package/valgrind/valgrind.mk                                                                 |    8 +-
 package/vde2/vde2.mk                                                                         |   24 +-
 package/vim/vim.mk                                                                           |    2 +-
 package/vlc/vlc.mk                                                                           |  140 +-
 package/vo-aacenc/vo-aacenc.mk                                                               |    8 +-
 package/vorbis-tools/vorbis-tools.mk                                                         |    2 +-
 package/vpnc/vpnc.mk                                                                         |   10 +-
 package/vtun/vtun.mk                                                                         |    2 +-
 package/wayland/wayland.mk                                                                   |    2 +-
 package/webkit/webkit.mk                                                                     |   18 +-
 package/webp/webp.mk                                                                         |    2 +-
 package/webrtc-audio-processing/webrtc-audio-processing.mk                                   |    2 +-
 package/weston/weston.mk                                                                     |   16 +-
 package/wget/wget.mk                                                                         |    6 +-
 package/whois/whois.mk                                                                       |    6 +-
 package/wireshark/wireshark.mk                                                               |    2 +-
 package/wpa_supplicant/wpa_supplicant.mk                                                     |   10 +-
 package/wvstreams/wvstreams.mk                                                               |   16 +-
 package/x11r7/libxcb/libxcb.mk                                                               |    4 +-
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                                                       |    2 +-
 package/x11r7/xapp_xdm/xapp_xdm.mk                                                           |    2 +-
 package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk                                                 |    8 +-
 package/x11r7/xapp_xrandr/xapp_xrandr.mk                                                     |    2 +-
 package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk                           |   14 +-
 package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk                             |    4 +-
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk                               |    4 +-
 package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk               |    4 +-
 package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk                 |    4 +-
 package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk                 |    4 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk                                           |    4 +-
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk                               |    4 +-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk                                   |    4 +-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk                                     |    4 +-
 package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk |    4 +-
 package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk   |    4 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk                                         |    4 +-
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk                                     |    4 +-
 package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk                     |    4 +-
 package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk                       |    4 +-
 package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk                       |    4 +-
 package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk                       |    4 +-
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk                               |    4 +-
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk                               |    4 +-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk                                     |    4 +-
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk                                   |    4 +-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk                                   |    4 +-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk                                     |    4 +-
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk                                 |    4 +-
 package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk                           |    4 +-
 package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk                           |    4 +-
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk                               |    4 +-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk                                   |    4 +-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk                                   |    4 +-
 package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk                       |    4 +-
 package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk                       |    4 +-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk                                   |    4 +-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk                                     |    4 +-
 package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk                   |    4 +-
 package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk                           |    4 +-
 package/x11r7/xkeyboard-config/xkeyboard-config.mk                                           |    2 +-
 package/x11r7/xlib_libFS/xlib_libFS.mk                                                       |    2 +-
 package/x11r7/xlib_libSM/xlib_libSM.mk                                                       |    2 +-
 package/x11r7/xlib_libX11/xlib_libX11.mk                                                     |    4 +-
 package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk                                       |    2 +-
 package/x11r7/xlib_libXaw/xlib_libXaw.mk                                                     |    2 +-
 package/x11r7/xlib_libXext/xlib_libXext.mk                                                   |    2 +-
 package/x11r7/xlib_libXfont/xlib_libXfont.mk                                                 |    4 +-
 package/x11r7/xlib_libXi/xlib_libXi.mk                                                       |    2 +-
 package/x11r7/xlib_libXinerama/xlib_libXinerama.mk                                           |    2 +-
 package/x11r7/xlib_libXrandr/xlib_libXrandr.mk                                               |    2 +-
 package/x11r7/xlib_libXrender/xlib_libXrender.mk                                             |    2 +-
 package/x11r7/xlib_libXres/xlib_libXres.mk                                                   |    2 +-
 package/x11r7/xlib_libXt/xlib_libXt.mk                                                       |    2 +-
 package/x11r7/xlib_libXv/xlib_libXv.mk                                                       |    2 +-
 package/x11r7/xlib_libXvMC/xlib_libXvMC.mk                                                   |    2 +-
 package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk                                           |    2 +-
 package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk                                             |    2 +-
 package/x11r7/xlib_libdmx/xlib_libdmx.mk                                                     |    2 +-
 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk                                       |    4 +-
 package/x11r7/xproto_xextproto/xproto_xextproto.mk                                           |    4 +-
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk                                     |  156 +-
 package/x11vnc/x11vnc.mk                                                                     |   20 +-
 package/xbmc-pvr-addons/xbmc-pvr-addons.mk                                                   |    6 +-
 package/xbmc/xbmc.mk                                                                         |   72 +-
 package/xenomai/xenomai.mk                                                                   |    6 +-
 package/xerces/xerces.mk                                                                     |    6 +-
 package/xfsprogs/xfsprogs.mk                                                                 |    4 +-
 package/xinetd/xinetd.mk                                                                     |    8 +-
 package/xmlstarlet/xmlstarlet.mk                                                             |    6 +-
 package/xscreensaver/xscreensaver.mk                                                         |    4 +-
 package/xterm/xterm.mk                                                                       |    2 +-
 package/zeromq/zeromq.mk                                                                     |    4 +-
 package/zmqpp/zmqpp.mk                                                                       |    8 +-
 package/znc/znc.mk                                                                           |   18 +-
 package/zxing/zxing.mk                                                                       |    4 +-
 toolchain/toolchain-external/toolchain-external.mk                                           |    6 +-
 672 files changed, 4175 insertions(+), 4148 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#28 lore raw

PATCH 1/1 pkg-generic: add checks on deprecated variables FOO_BAR_OPT

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 4 lines

This patch introduces a check for the usage of deprecated variable FOO_BAR_OPT, and suggests to use FOO_BAR_OPTS instead.

Regards,
Yann E. MORIN.

Quoted 28 lines

---
v2: collapse patches that each add one check

 package/pkg-generic.mk |  12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
package/pkg-generic.mk +12 -0
@@ -717,6 +717,18 @@
 	$$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep)))
 endif
 
+# Ensure unified variable name conventions between all packages
+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
+
 TARGETS += $(1)
 
 ifneq ($$($(2)_PERMISSIONS),)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS

In reply to Thomas De Schampheleire

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 9 lines

While the autotools infrastructure was using FOO_MAKE_OPT, generic packages were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem when a new infrastructure is introduced that wants to make use of FOO_MAKE_OPT(S), and can live alongside either generic-package or autotools-package. The new infrastructure will have to choose between either OPT or OPTS, and thus rule out transparent usage by respectively generic packages or generic packages. An example of such an infrastructure is kconfig-package, which provides kconfig-related make targets.

Quoted 7 lines

The OPTS variant is more logical, as there are typically multiple options.

This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS. Sed command used:

    find * -type f | xargs sed -i 's#_MAKE_OPT\>#&S#g'

Casual visual review, plus:

    git difftool -y -x 'diff -du -I "_MAKE_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 918 lines

---
v2: rebase

 boot/at91bootstrap3/at91bootstrap3.mk     |   4 ++--
 docs/manual/adding-packages-autotools.txt |   2 +-
 docs/manual/adding-packages-cmake.txt     |   2 +-
 docs/manual/adding-packages-kconfig.txt   |   2 +-
 package/avahi/avahi.mk                    |   2 +-
 package/dnsmasq/dnsmasq.mk                |  12 ++++++------
 package/e2fsprogs/e2fsprogs.mk            |   2 +-
 package/faifa/faifa.mk                    |   2 +-
 package/freetype/freetype.mk              |   2 +-
 package/gcc/gcc-initial/gcc-initial.mk    |   2 +-
 package/httping/httping.mk                |   6 +++---
 package/ipsec-tools/ipsec-tools.mk        |   2 +-
 package/iputils/iputils.mk                |   6 +++---
 package/iw/iw.mk                          |   6 +++---
 package/libdnet/libdnet.mk                |   6 +++---
 package/libjson/libjson.mk                |  12 ++++++------
 package/libseccomp/libseccomp.mk          |   2 +-
 package/linux-pam/linux-pam.mk            |   2 +-
 package/lm-sensors/lm-sensors.mk          |  12 ++++++------
 package/lshw/lshw.mk                      |   6 +++---
 package/lvm2/lvm2.mk                      |   2 +-
 package/mdadm/mdadm.mk                    |   2 +-
 package/mii-diag/mii-diag.mk              |   4 ++--
 package/mpfr/mpfr.mk                      |   2 +-
 package/openswan/openswan.mk              |  12 ++++++------
 package/openvmtools/openvmtools.mk        |   2 +-
 package/pkg-autotools.mk                  |   6 +++---
 package/pkg-cmake.mk                      |  12 ++++++------
 package/pppd/pppd.mk                      |   8 ++++----
 package/pv/pv.mk                          |   2 +-
 package/quota/quota.mk                    |   2 +-
 package/rp-pppoe/rp-pppoe.mk              |   2 +-
 package/rubix/rubix.mk                    |   2 +-
 package/schifra/schifra.mk                |   4 ++--
 package/sdl_ttf/sdl_ttf.mk                |   2 +-
 package/setserial/setserial.mk            |   2 +-
 package/speex/speex.mk                    |   2 +-
 package/sysstat/sysstat.mk                |   2 +-
 package/systemd/systemd.mk                |   4 ++--
 package/tn5250/tn5250.mk                  |   2 +-
 package/util-linux/util-linux.mk          |   2 +-
 package/whois/whois.mk                    |   6 +++---
 package/xinetd/xinetd.mk                  |   2 +-
 package/zmqpp/zmqpp.mk                    |   8 ++++----
 package/zxing/zxing.mk                    |   4 ++--
 45 files changed, 95 insertions(+), 95 deletions(-)
boot/at91bootstrap3/at91bootstrap3.mk +2 -2
@@ -17,7 +17,7 @@
 AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \
 	$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))
 
-AT91BOOTSTRAP3_MAKE_OPT = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
+AT91BOOTSTRAP3_MAKE_OPTS = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
 
 ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)
 define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES
@@ -41,7 +41,7 @@
 endef
 
 define AT91BOOTSTRAP3_BUILD_CMDS
-	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) boot
+	$(MAKE) $(AT91BOOTSTRAP3_MAKE_OPTS) -C $(@D) boot
 endef
 
 define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
docs/manual/adding-packages-autotools.txt +1 -1
@@ -111,7 +111,7 @@
   variables to pass to make in the build step. These are passed before
   the +make+ command. By default, empty.
 
-* +LIBFOO_MAKE_OPT+, to specify additional variables to
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to
   pass to make in the build step. These are passed after the
   +make+ command. By default, empty.
 
docs/manual/adding-packages-cmake.txt +1 -1
@@ -108,7 +108,7 @@
   pass to make in the build step. These are passed before the +make+
   command. By default, empty.
 
-* +LIBFOO_MAKE_OPT+, to specify additional variables to pass to make
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to pass to make
   in the build step. These are passed after the +make+ command. By
   default, empty.
 
docs/manual/adding-packages-kconfig.txt +1 -1
@@ -47,7 +47,7 @@
   support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
 
 * +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
-  ediftors. This may need to include '$(FOO_MAKE_OPT)', for example. By
+  editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
   default, empty.
 
 * +FOO_KCONFIG_FIXUP_CMDS+: a list of shell commands needed to fixup the
package/avahi/avahi.mk +1 -1
@@ -138,7 +138,7 @@
 AVAHI_CONF_OPT += --disable-python
 endif
 
-AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
+AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 
 define AVAHI_USERS
 	avahi -1 avahi -1 * - - -
package/dnsmasq/dnsmasq.mk +6 -6
@@ -8,8 +8,8 @@
 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
-DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
-DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
+DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_DEPENDENCIES = host-pkgconf
 DNSMASQ_LICENSE = Dual GPLv2/GPLv3
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
@@ -37,7 +37,7 @@
 # NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
 	DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext
-	DNSMASQ_MAKE_OPT += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+	DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
 	DNSMASQ_COPTS += -DHAVE_IDN
 	DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
 endif
@@ -58,7 +58,7 @@
 
 # liblua uses dlopen when dynamically linked
 ifneq ($(BR2_PREFER_STATIC_LIB),y)
-	DNSMASQ_MAKE_OPT += LIBS+="-ldl"
+	DNSMASQ_MAKE_OPTS += LIBS+="-ldl"
 endif
 
 define DNSMASQ_ENABLE_LUA
@@ -98,11 +98,11 @@
 	$(DNSMASQ_ENABLE_DBUS)
 	$(DNSMASQ_ENABLE_LUA)
 	$(DNSMASQ_ENABLE_CONNTRACK)
-	$(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
+	$(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
 endef
 
 define DNSMASQ_INSTALL_TARGET_CMDS
-	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install$(DNSMASQ_I18N)
+	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N)
 	mkdir -p $(TARGET_DIR)/var/lib/misc/
 endef
 
package/e2fsprogs/e2fsprogs.mk +1 -1
@@ -31,7 +31,7 @@
 
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
 
-E2FSPROGS_MAKE_OPT = \
+E2FSPROGS_MAKE_OPTS = \
 	LDCONFIG=true
 
 define HOST_E2FSPROGS_INSTALL_CMDS
package/faifa/faifa.mk +1 -1
@@ -11,7 +11,7 @@
 FAIFA_LICENSE = BSD-3c
 FAIFA_LICENSE_FILES = COPYING
 
-FAIFA_MAKE_OPT += GIT_REV=$(FAIFA_VERSION)
+FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION)
 
 # This package uses autoconf, but not automake, so we need to call
 # their special autogen.sh script, and have custom target and staging
package/freetype/freetype.mk +1 -1
@@ -8,7 +8,7 @@
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES
-FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
+FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
 FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf
package/gcc/gcc-initial/gcc-initial.mk +1 -1
@@ -53,7 +53,7 @@
 # We need to tell gcc that the C library will be providing the ssp
 # support, as it can't guess it since the C library hasn't been built
 # yet (we're gcc-initial).
-HOST_GCC_INITIAL_MAKE_OPT = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
+HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
 HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
 
 $(eval $(host-autotools-package))
package/httping/httping.mk +3 -3
@@ -18,19 +18,19 @@
 	$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw)
-HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
+HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
 	FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
 	NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
 	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
 	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
 
 define HTTPING_BUILD_CMDS
-	$(HTTPING_MAKE_OPT) LDFLAGS="$(HTTPING_LDFLAGS)" \
+	$(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
 		$(MAKE) DEBUG=no -C $(@D)
 endef
 
 define HTTPING_INSTALL_TARGET_CMDS
-	$(HTTPING_MAKE_OPT) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
 $(eval $(generic-package))
package/ipsec-tools/ipsec-tools.mk +1 -1
@@ -13,7 +13,7 @@
 IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
 
 # configure hardcodes -Werror, so override CFLAGS on make invocation
-IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
+IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
 
 # openssl uses zlib, so we need to explicitly link with it when static
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
package/iputils/iputils.mk +3 -3
@@ -18,7 +18,7 @@
 endif
 
 # Disabling CAP_SETPCAP (file capabilities)
-IPUTILS_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
+IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
 	CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
 	arping clockdiff ping rarpd rdisc tftpd tracepath
 
@@ -26,7 +26,7 @@
 # To support md5 for ping6
 IPUTILS_DEPENDENCIES += openssl
 
-IPUTILS_MAKE_OPT += ping6 tracepath6 traceroute6
+IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6
 
 define IPUTILS_IPV6_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(@D)/ping6       $(TARGET_DIR)/bin/ping6
@@ -36,7 +36,7 @@
 endif
 
 define IPUTILS_BUILD_CMDS
-	$(MAKE) -C $(@D) $(IPUTILS_MAKE_OPT)
+	$(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
 endef
 
 define IPUTILS_INSTALL_TARGET_CMDS
package/iw/iw.mk +3 -3
@@ -10,18 +10,18 @@
 IW_LICENSE = iw license
 IW_LICENSE_FILES = COPYING
 IW_DEPENDENCIES = host-pkgconf libnl
-IW_MAKE_OPT = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
+IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
 IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
 # libnl needs pthread/m, so we need to explicitly with them when static
 # these need to added AFTER libnl, so we have to override LIBS completely
-IW_MAKE_OPT += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
+IW_MAKE_OPTS += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
 endif
 
 define IW_BUILD_CMDS
-	$(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
+	$(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPTS) -C $(@D)
 endef
 
 define IW_INSTALL_TARGET_CMDS
package/libdnet/libdnet.mk +3 -3
@@ -17,9 +17,9 @@
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
 LIBDNET_DEPENDENCIES = python
 LIBDNET_CONF_OPT += --with-python
-LIBDNET_MAKE_OPT = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
-LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
-LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
+LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
+LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
+LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
 endif
 
 # Needed for autoreconf to work properly
package/libjson/libjson.mk +6 -6
@@ -14,13 +14,13 @@
 LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBJSON_MAKE_OPT += SHARED=0
+LIBJSON_MAKE_OPTS += SHARED=0
 else
-LIBJSON_MAKE_OPT += SHARED=1
+LIBJSON_MAKE_OPTS += SHARED=1
 LIBJSON_CXXFLAGS += -fPIC
 endif
 
-LIBJSON_MAKE_OPT += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
+LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
 
 define LIBJSON_EXTRACT_CMDS
 	unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
@@ -33,17 +33,17 @@
 	mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
 		$(@D)/_internal/Source/Dependencies
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		$(LIBJSON_MAKE_OPT) -C $(@D)
+		$(LIBJSON_MAKE_OPTS) -C $(@D)
 endef
 
 define LIBJSON_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		$(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr install -C $(@D)
+		$(LIBJSON_MAKE_OPTS) prefix=$(TARGET_DIR)/usr install -C $(@D)
 endef
 
 define LIBJSON_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		$(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr install -C $(@D)
+		$(LIBJSON_MAKE_OPTS) prefix=$(STAGING_DIR)/usr install -C $(@D)
 endef
 
 $(eval $(generic-package))
package/libseccomp/libseccomp.mk +1 -1
@@ -13,7 +13,7 @@
 # Needed for configure to find our system headers:
 LIBSECCOMP_CONF_ENV            = SYSROOT=$(STAGING_DIR)
 LIBSECCOMP_MAKE_ENV            = $(TARGET_CONFIGURE_OPTS)
-LIBSECCOMP_MAKE_OPT            = SUBDIRS_BUILD=src
+LIBSECCOMP_MAKE_OPTS            = SUBDIRS_BUILD=src
 LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
 LIBSECCOMP_INSTALL_TARGET_OPT  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
 
package/linux-pam/linux-pam.mk +1 -1
@@ -23,7 +23,7 @@
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 	LINUX_PAM_DEPENDENCIES += gettext
-	LINUX_PAM_MAKE_OPT += LIBS=-lintl
+	LINUX_PAM_MAKE_OPTS += LIBS=-lintl
 endif
 
 # Install default pam config (deny everything)
package/lm-sensors/lm-sensors.mk +6 -6
@@ -20,28 +20,28 @@
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
 LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
 
-LM_SENSORS_MAKE_OPT = \
+LM_SENSORS_MAKE_OPTS = \
 	BUILD_STATIC_LIB=1 \
 	MACHINE=$(KERNEL_ARCH) \
 	PREFIX=/usr
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=0
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0
 else
-LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=1
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1
 endif
 
 define LM_SENSORS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPT) -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D)
 endef
 
 define LM_SENSORS_INSTALL_STAGING_CMDS
-	$(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
+	$(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
 	rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y))
 endef
 
 define LM_SENSORS_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+	$(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
 	rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_))
 endef
 
package/lshw/lshw.mk +3 -3
@@ -14,18 +14,18 @@
 LSHW_CFLAGS += -DNONLS
 endif
 
-LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
+LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
 	RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
 LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
 LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 
 define LSHW_BUILD_CMDS
-	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
+	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)
 endef
 
 define LSHW_INSTALL_TARGET_CMDS
 	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
-		$(LSHW_MAKE_OPT) install
+		$(LSHW_MAKE_OPTS) install
 endef
 
 $(eval $(generic-package))
package/lvm2/lvm2.mk +1 -1
@@ -32,7 +32,7 @@
 endif
 
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
-LVM2_MAKE_OPT = device-mapper
+LVM2_MAKE_OPTS = device-mapper
 LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
 LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
 endif
package/mdadm/mdadm.mk +1 -1
@@ -10,7 +10,7 @@
 MDADM_LICENSE = GPLv2+
 MDADM_LICENSE_FILES = COPYING
 
-MDADM_MAKE_OPT = \
+MDADM_MAKE_OPTS = \
 	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
 
 MDADM_INSTALL_TARGET_OPT = \
package/mii-diag/mii-diag.mk +2 -2
@@ -11,7 +11,7 @@
 MII_DIAG_LICENSE = GPL # No version specified
 MII_DIAG_LICENSE_FILES = mii-diag.c
 
-MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
+MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
 
 define MII_DIAG_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
@@ -22,7 +22,7 @@
 MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES
 
 define MII_DIAG_BUILD_CMDS
-	$(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) mii-diag
+	$(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag
 endef
 
 define MII_DIAG_INSTALL_TARGET_CMDS
package/mpfr/mpfr.mk +1 -1
@@ -11,7 +11,7 @@
 MPFR_LICENSE_FILES = COPYING.LESSER
 MPFR_INSTALL_STAGING = YES
 MPFR_DEPENDENCIES = gmp
-MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
+MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
package/openswan/openswan.mk +6 -6
@@ -10,31 +10,31 @@
 OPENSWAN_LICENSE_FILES = COPYING LICENSE
 
 OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
-OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
+OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
 	USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \
 	USE_KLIPS=false USE_MAST=false USE_NM=false
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 	OPENSWAN_DEPENDENCIES += libcurl
-	OPENSWAN_MAKE_OPT += USE_LIBCURL=true
+	OPENSWAN_MAKE_OPTS += USE_LIBCURL=true
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	OPENSWAN_DEPENDENCIES += openssl
-	OPENSWAN_MAKE_OPT += HAVE_OPENSSL=true
+	OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true
 ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
-	OPENSWAN_MAKE_OPT += HAVE_OCF=true
+	OPENSWAN_MAKE_OPTS += HAVE_OCF=true
 endif
 endif
 
 define OPENSWAN_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(OPENSWAN_MAKE_OPT) programs
+		$(OPENSWAN_MAKE_OPTS) programs
 endef
 
 define OPENSWAN_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+		$(OPENSWAN_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
 endef
 
 $(eval $(generic-package))
package/openvmtools/openvmtools.mk +1 -1
@@ -41,7 +41,7 @@
 
 ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y)
 OPENVMTOOLS_CONF_OPT += --with-pam
-OPENVMTOOLS_MAKE_OPT += CFLAGS+="-Wno-unused-local-typedefs"
+OPENVMTOOLS_MAKE_OPTS += CFLAGS+="-Wno-unused-local-typedefs"
 OPENVMTOOLS_DEPENDENCIES += linux-pam
 else
 OPENVMTOOLS_CONF_OPT += --without-pam
package/pkg-autotools.mk +3 -3
@@ -106,7 +106,7 @@
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
 $(2)_MAKE_ENV			?=
-$(2)_MAKE_OPT			?=
+$(2)_MAKE_OPTS			?=
 $(2)_INSTALL_OPT                ?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
@@ -270,11 +270,11 @@
 ifndef $(2)_BUILD_CMDS
 ifeq ($(4),target)
 define $(2)_BUILD_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 else
 define $(2)_BUILD_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 endif
package/pkg-cmake.mk +6 -6
@@ -40,7 +40,7 @@
 $(2)_CONF_OPT			?=
 $(2)_MAKE			?= $$(MAKE)
 $(2)_MAKE_ENV			?=
-$(2)_MAKE_OPT			?=
+$(2)_MAKE_OPTS			?=
 $(2)_INSTALL_HOST_OPT		?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR) install
@@ -109,11 +109,11 @@
 ifndef $(2)_BUILD_CMDS
 ifeq ($(4),target)
 define $(2)_BUILD_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 else
 define $(2)_BUILD_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 endif
@@ -124,7 +124,7 @@
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
@@ -134,7 +134,7 @@
 #
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
@@ -144,7 +144,7 @@
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
package/pppd/pppd.mk +4 -4
@@ -19,11 +19,11 @@
 
 ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
 	PPPD_DEPENDENCIES += libpcap
-	PPPD_MAKE_OPT += FILTER=y
+	PPPD_MAKE_OPTS += FILTER=y
 endif
 
 ifeq ($(BR2_INET_IPV6),y)
-	PPPD_MAKE_OPT += HAVE_INET6=y
+	PPPD_MAKE_OPTS += HAVE_INET6=y
 endif
 
 # pppd bundles some but not all of the needed kernel headers. The embedded
@@ -43,7 +43,7 @@
 
 define PPPD_BUILD_CMDS
 	$(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
-		-C $(@D) $(PPPD_MAKE_OPT)
+		-C $(@D) $(PPPD_MAKE_OPTS)
 endef
 
 ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y)
@@ -94,7 +94,7 @@
 endef
 
 define PPPD_INSTALL_STAGING_CMDS
-	$(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPT) install-devel
+	$(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel
 endef
 
 $(eval $(generic-package))
package/pv/pv.mk +1 -1
@@ -23,7 +23,7 @@
 # configuration, as the ld default emulation may not necessarily be
 # the correct one. By passing the below values for LD and LDFLAGS, we
 # ensure that 'gcc' is used to do these partial linking steps.
-PV_MAKE_OPT = \
+PV_MAKE_OPTS = \
 	LD="$(TARGET_CC)" \
 	LDFLAGS="-Wl,-r -nostdlib"
 
package/quota/quota.mk +1 -1
@@ -24,7 +24,7 @@
 QUOTA_LDFLAGS += -ltirpc
 endif
 
-QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 QUOTA_CONF_ENV = \
 	CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 
package/rp-pppoe/rp-pppoe.mk +1 -1
@@ -11,7 +11,7 @@
 RP_PPPOE_DEPENDENCIES = pppd
 RP_PPPOE_SUBDIR = src
 RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
-RP_PPPOE_MAKE_OPT = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
+RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
 RP_PPPOE_CONF_OPT = --disable-debugging
 RP_PPPOE_CONF_ENV = \
 	rpppoe_cv_pack_bitfields=normal \
package/rubix/rubix.mk +1 -1
@@ -11,7 +11,7 @@
 RUBIX_LICENSE = Public Domain
 RUBIX_LICENSE_FILES = LICENCE
 
-RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
+RUBIX_MAKE_OPTS = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
 
 RUBIX_DEPENDENCIES = xlib_libX11
 
package/schifra/schifra.mk +2 -2
@@ -11,13 +11,13 @@
 SCHIFRA_LICENSE = schifra license
 SCHIFRA_LICENSE_FILES = schifra_license.txt
 
-SCHIFRA_MAKE_OPT = COMPILER="$(TARGET_CXX)" \
+SCHIFRA_MAKE_OPTS = COMPILER="$(TARGET_CXX)" \
 		   OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o"
 
 # The examples are the only buildable artefacts.
 ifeq ($(BR2_PACKAGE_SCHIFRA_EXAMPLES),y)
 define SCHIFRA_BUILD_CMDS
-	$(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPT) all
+	$(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPTS) all
 endef
 
 define SCHIFRA_INSTALL_EXAMPLES
package/sdl_ttf/sdl_ttf.mk +1 -1
@@ -16,5 +16,5 @@
 		--with-freetype-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-prefix=$(STAGING_DIR)/usr
 
-SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
+SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
 $(eval $(autotools-package))
package/setserial/setserial.mk +1 -1
@@ -11,7 +11,7 @@
 SETSERIAL_LICENSE = GPLv2
 SETSERIAL_LICENSE_FILES = debian/copyright
 # make all also builds setserial.cat which needs nroff
-SETSERIAL_MAKE_OPT = setserial
+SETSERIAL_MAKE_OPTS = setserial
 
 define SETSERIAL_APPLY_DEBIAN_PATCHES
 	# Touching gorhack.h is needed for the Debian patch 18 to work
package/speex/speex.mk +1 -1
@@ -31,7 +31,7 @@
 SPEEX_POST_CONFIGURE_HOOKS += SPEEX_LIBTOOL_FIXUP
 
 define SPEEX_BUILD_CMDS
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) -C $(@D)/$($(PKG)_SUBDIR)
 endef
 
 $(eval $(autotools-package))
package/sysstat/sysstat.mk +1 -1
@@ -14,7 +14,7 @@
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 SYSSTAT_DEPENDENCIES += gettext
-SYSSTAT_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -lintl"
+SYSSTAT_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -lintl"
 endif
 
 # The isag tool is a post processing script that depends on tcl/tk
package/systemd/systemd.mk +2 -2
@@ -138,8 +138,8 @@
 endif
 
 # mq_getattr needs -lrt
-SYSTEMD_MAKE_OPT += LIBS=-lrt
-SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl
+SYSTEMD_MAKE_OPTS += LIBS=-lrt
+SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl
 
 define SYSTEMD_INSTALL_INIT_HOOK
 	ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init
package/tn5250/tn5250.mk +1 -1
@@ -6,7 +6,7 @@
 
 TN5250_VERSION = 0.17.4
 TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
-TN5250_MAKE_OPT = CPPFLAGS=""
+TN5250_MAKE_OPTS = CPPFLAGS=""
 TN5250_DEPENDENCIES = ncurses
 TN5250_LICENSE = LGPLv2.1+
 TN5250_LICENSE_FILES = COPYING
package/util-linux/util-linux.mk +1 -1
@@ -44,7 +44,7 @@
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 UTIL_LINUX_DEPENDENCIES += gettext
-UTIL_LINUX_MAKE_OPT += LIBS=-lintl
+UTIL_LINUX_MAKE_OPTS += LIBS=-lintl
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
package/whois/whois.mk +3 -3
@@ -10,7 +10,7 @@
 # take precedence over busybox implementation
 WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
-WHOIS_MAKE_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LIBS="$(WHOIS_EXTRA_LIBS)"
 WHOIS_LICENSE = GPLv2+
 WHOIS_LICENSE_FILES = COPYING
@@ -32,11 +32,11 @@
 endif
 
 define WHOIS_BUILD_CMDS
-	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) -C $(@D)
+	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D)
 endef
 
 define WHOIS_INSTALL_TARGET_CMDS
-	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) \
+	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \
 		BASEDIR="$(TARGET_DIR)" install -C $(@D)
 endef
 
package/xinetd/xinetd.mk +1 -1
@@ -28,6 +28,6 @@
 	CFLAGS="$(XINETD_CFLAGS)" \
 	LIBS="$(XINETD_LIBS)"
 
-XINETD_MAKE_OPT = AR="$(TARGET_AR)"
+XINETD_MAKE_OPTS = AR="$(TARGET_AR)"
 
 $(eval $(autotools-package))
package/zmqpp/zmqpp.mk +4 -4
@@ -11,7 +11,7 @@
 ZMQPP_LICENSE = LGPLv3+ with exceptions
 ZMQPP_LICENSE_FILES = COPYING COPYING.LESSER
 
-ZMQPP_MAKE_OPT = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
+ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
 ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
 
 ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y)
@@ -21,19 +21,19 @@
 define ZMQPP_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
 		LDFLAGS="$(ZMQPP_LDFLAGS)" \
-		$(ZMQPP_MAKE_OPT) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
+		$(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
 endef
 
 define ZMQPP_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/include/zmqpp
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		$(ZMQPP_MAKE_OPT) DESTDIR=$(TARGET_DIR) install -C $(@D)
+		$(ZMQPP_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -C $(@D)
 endef
 
 define ZMQPP_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/zmqpp
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		$(ZMQPP_MAKE_OPT) DESTDIR=$(STAGING_DIR) install -C $(@D)
+		$(ZMQPP_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -C $(@D)
 endef
 
 $(eval $(generic-package))
package/zxing/zxing.mk +2 -2
@@ -17,7 +17,7 @@
 else
 # There is no locale support in the toolchain and libiconv
 # is not available so disable iconv support in zxing
-ZING_MAKE_OPT=CXXFLAGS+="-DNO_ICONV"
+ZING_MAKE_OPTS=CXXFLAGS+="-DNO_ICONV"
 endif
 endif
 
@@ -26,7 +26,7 @@
 endef
 
 define ZXING_BUILD_CMDS
-	$(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPT)
+	$(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPTS)
 endef
 
 define ZXING_INSTALL_STAGING_CMDS
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_OPT.

Sed command used:

   find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'

Casual visual review, plus:

    git difftool -y -x 'diff -du -I "_INSTALL_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 156 lines

---
v2: rebase

 docs/manual/adding-packages-perl.txt   |   2 +-
 docs/manual/adding-packages-python.txt |   6 +++---
 package/gcc/gcc-initial/gcc-initial.mk |   2 +-
 package/pkg-autotools.mk               |   4 ++--
 package/pkg-python.mk                  |  12 ++++++------
 package/scons/scons.mk                 |   2 +-
 package/util-linux/util-linux.mk       |   2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
docs/manual/adding-packages-perl.txt +1 -1
@@ -113,6 +113,6 @@
   pass to +make pure_install+ or +perl Build install+ in the install step.
   By default, empty.
 
-* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to
+* +HOST_PERL_FOO_INSTALL_OPTS+, to specify additional options to
   pass to +make pure_install+ or +perl Build install+ in the install step.
   By default, empty.
docs/manual/adding-packages-python.txt +3 -3
@@ -128,16 +128,16 @@
   passed automatically by the infrastructure.
 
 * +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
-  +HOST_PYTHON_FOO_INSTALL_OPT+ to specify additional options to pass
+  +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
   to the Python +setup.py+ script during the target installation step,
   the staging installation step or the host installation,
   respectively. Note that the infrastructure is automatically passing
   some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
   or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
-  packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host
+  packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
   distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
   +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
-  packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for host
+  packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
   setuptools packages).
 
 * +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
package/gcc/gcc-initial/gcc-initial.mk +1 -1
@@ -54,6 +54,6 @@
 # support, as it can't guess it since the C library hasn't been built
 # yet (we're gcc-initial).
 HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
-HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
+HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc
 
 $(eval $(host-autotools-package))
package/pkg-autotools.mk +2 -2
@@ -107,7 +107,7 @@
 $(2)_CONF_OPT			?=
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_OPT                ?= install
+$(2)_INSTALL_OPTS                ?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
 
@@ -285,7 +285,7 @@
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
package/pkg-python.mk +6 -6
@@ -45,7 +45,7 @@
 HOST_PKG_PYTHON_DISTUTILS_ENV = \
 	PATH=$(BR_PATH)
 
-HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
+HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
 	--prefix=$(HOST_DIR)/usr
 
 # Target setuptools-based packages
@@ -72,7 +72,7 @@
 HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
 	PATH=$(BR_PATH)
 
-HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
+HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
 	--prefix=$(HOST_DIR)/usr
 
 ################################################################################
@@ -96,7 +96,7 @@
 
 $(2)_ENV         ?=
 $(2)_BUILD_OPT   ?=
-$(2)_INSTALL_OPT ?=
+$(2)_INSTALL_OPTS ?=
 
 ifndef $(2)_SETUP_TYPE
  ifdef $(3)_SETUP_TYPE
@@ -118,7 +118,7 @@
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
 endif
 # Setuptools
 else ifeq ($$($(2)_SETUP_TYPE),setuptools)
@@ -132,7 +132,7 @@
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
 endif
 else
 $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'")
@@ -241,7 +241,7 @@
 	(cd $$($$(PKG)_BUILDDIR)/; \
 		$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
 		$$($(2)_PYTHON_INTERPRETER) setup.py install \
-		$$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
+		$$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS))
 endef
 endif
 
package/scons/scons.mk +1 -1
@@ -12,7 +12,7 @@
 
 HOST_SCONS_NEEDS_HOST_PYTHON = python2
 
-HOST_SCONS_INSTALL_OPT = \
+HOST_SCONS_INSTALL_OPTS = \
 	--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
 
 $(eval $(host-python-package))
package/util-linux/util-linux.mk +1 -1
@@ -141,4 +141,4 @@
 # one, so it disappears
 UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
 UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
-HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#7 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_TARGET_OPT.

Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_TARGET_OPT\>#&S#g'

Casual visual review, plus:

    git difftool -y -x 'diff -du -I "_INSTALL_TARGET_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 1,002 lines

---
v2: rebase

 boot/grub2/grub2.mk                                                                          |   2 +-
 docs/manual/adding-packages-autotools.txt                                                    |   2 +-
 docs/manual/adding-packages-cmake.txt                                                        |   2 +-
 docs/manual/adding-packages-perl.txt                                                         |   2 +-
 docs/manual/adding-packages-python.txt                                                       |   6 ++--
 package/acl/acl.mk                                                                           |   2 +-
 package/attr/attr.mk                                                                         |   2 +-
 package/cups/cups.mk                                                                         |   2 +-
 package/dmraid/dmraid.mk                                                                     |   2 +-
 package/expat/expat.mk                                                                       |   2 +-
 package/expect/expect.mk                                                                     |   2 +-
 package/ifplugd/ifplugd.mk                                                                   |   2 +-
 package/libdnet/libdnet.mk                                                                   |   2 +-
 package/libseccomp/libseccomp.mk                                                             |   2 +-
 package/lvm2/lvm2.mk                                                                         |   2 +-
 package/mdadm/mdadm.mk                                                                       |   2 +-
 package/mxml/mxml.mk                                                                         |   2 +-
 package/netsnmp/netsnmp.mk                                                                   |   2 +-
 package/php/php.mk                                                                           |   2 +-
 package/pkg-autotools.mk                                                                     |   4 +-
 package/pkg-cmake.mk                                                                         |   4 +-
 package/pkg-perl.mk                                                                          |   8 +++---
 package/pkg-python.mk                                                                        |  12 +++++-----
 package/quota/quota.mk                                                                       |   2 +-
 package/rpm/rpm.mk                                                                           |   2 +-
 package/rubix/rubix.mk                                                                       |   2 +-
 package/samba/samba.mk                                                                       |   2 +-
 package/screen/screen.mk                                                                     |   2 +-
 package/sysstat/sysstat.mk                                                                   |   2 +-
 package/util-linux/util-linux.mk                                                             |   2 +-
 package/webkit/webkit.mk                                                                     |   2 +-
 package/x11r7/xapp_xcalc/xapp_xcalc.mk                                                       |   2 +-
 package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk                             |   2 +-
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk                               |   2 +-
 package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk               |   2 +-
 package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk                 |   2 +-
 package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk                 |   2 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk                                           |   2 +-
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk                               |   2 +-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk                                   |   2 +-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk                                     |   2 +-
 package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk |   2 +-
 package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk   |   2 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk                                         |   2 +-
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk                                     |   2 +-
 package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk                     |   2 +-
 package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk                       |   2 +-
 package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk                       |   2 +-
 package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk                       |   2 +-
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk                               |   2 +-
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk                               |   2 +-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk                                     |   2 +-
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk                                   |   2 +-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk                                     |   2 +-
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk                                 |   2 +-
 package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk                           |   2 +-
 package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk                           |   2 +-
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk                               |   2 +-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk                       |   2 +-
 package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk                       |   2 +-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk                                     |   2 +-
 package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk                   |   2 +-
 package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk                           |   2 +-
 package/xenomai/xenomai.mk                                                                   |   2 +-
 package/xfsprogs/xfsprogs.mk                                                                 |   2 +-
 package/xscreensaver/xscreensaver.mk                                                         |   2 +-
 package/xterm/xterm.mk                                                                       |   2 +-
 71 files changed, 83 insertions(+), 83 deletions(-)
boot/grub2/grub2.mk +1 -1
@@ -65,7 +65,7 @@
 # directory, and the image generation process (below) will use the
 # grub-mkimage tool and Grub2 modules from the host directory.
 
-GRUB2_INSTALL_TARGET_OPT = DESTDIR=$(HOST_DIR) install
+GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
 
 define GRUB2_IMAGE_INSTALLATION
 	mkdir -p $(dir $(GRUB2_IMAGE))
docs/manual/adding-packages-autotools.txt +1 -1
@@ -153,7 +153,7 @@
   correct for most autotools packages. It is still possible to override
   it.
 
-* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options
+* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options
   used to install the package to the target directory. By default, the
   value is +DESTDIR=$(TARGET_DIR) install+. The default
   value is correct for most autotools packages, but it is still possible
docs/manual/adding-packages-cmake.txt +1 -1
@@ -117,7 +117,7 @@
   is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
   CMake packages. It is still possible to override it.
 
-* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options used to
+* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options used to
   install the package to the target directory. By default, the value
   is +DESTDIR=$(TARGET_DIR) install+. The default value is correct
   for most CMake packages, but it is still possible to override it if
docs/manual/adding-packages-perl.txt +1 -1
@@ -109,7 +109,7 @@
   options to pass to +make pure_all+ or +perl Build build+ in the build step.
   By default, empty.
 
-* +PERL_FOO_INSTALL_TARGET_OPT+, to specify additional options to
+* +PERL_FOO_INSTALL_TARGET_OPTS+, to specify additional options to
   pass to +make pure_install+ or +perl Build install+ in the install step.
   By default, empty.
 
docs/manual/adding-packages-python.txt +3 -3
@@ -127,15 +127,15 @@
   packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
   passed automatically by the infrastructure.
 
-* +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
+* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
   +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
   to the Python +setup.py+ script during the target installation step,
   the staging installation step or the host installation,
   respectively. Note that the infrastructure is automatically passing
-  some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
+  some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+
   or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
   packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
-  distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
+  distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or
   +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
   packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
   setuptools packages).
package/acl/acl.mk +1 -1
@@ -22,7 +22,7 @@
 	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib	\
 	install-dev install-lib
 
-ACL_INSTALL_TARGET_OPT = 			\
+ACL_INSTALL_TARGET_OPTS = 			\
 	prefix=$(TARGET_DIR)/usr 		\
 	exec_prefix=$(TARGET_DIR)/usr 		\
 	install install-lib
package/attr/attr.mk +1 -1
@@ -21,7 +21,7 @@
 	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib 	\
 	install-dev install-lib
 
-ATTR_INSTALL_TARGET_OPT = 			\
+ATTR_INSTALL_TARGET_OPTS = 			\
 	prefix=$(TARGET_DIR)/usr 		\
 	exec_prefix=$(TARGET_DIR)/usr 		\
 	install install-lib
package/cups/cups.mk +1 -1
@@ -11,7 +11,7 @@
 CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
-CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
 CUPS_CONF_OPT = --without-perl \
 		--without-java \
 		--without-php \
package/dmraid/dmraid.mk +1 -1
@@ -11,7 +11,7 @@
 # lib and tools race with parallel make
 DMRAID_MAKE = $(MAKE1)
 DMRAID_INSTALL_STAGING = YES
-DMRAID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+DMRAID_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
 DMRAID_LICENSE = GPLv2
 DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
 
package/expat/expat.mk +1 -1
@@ -8,7 +8,7 @@
 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
 EXPAT_INSTALL_STAGING = YES
 EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
-EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
+EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkgconf
 EXPAT_LICENSE = MIT
 EXPAT_LICENSE_FILES = COPYING
package/expect/expect.mk +1 -1
@@ -15,6 +15,6 @@
 EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
 
 # Since we don't want examples installed
-EXPECT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR)  install-binaries
+EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR)  install-binaries
 
 $(eval $(autotools-package))
package/ifplugd/ifplugd.mk +1 -1
@@ -11,7 +11,7 @@
 IFPLUGD_AUTORECONF = YES
 
 # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
-IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
+IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
 IFPLUGD_CONF_OPT = --disable-lynx --with-initdir=/etc/init.d/
 IFPLUGD_DEPENDENCIES = libdaemon
 
package/libdnet/libdnet.mk +1 -1
@@ -18,7 +18,7 @@
 LIBDNET_DEPENDENCIES = python
 LIBDNET_CONF_OPT += --with-python
 LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
-LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
+LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
 LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
 endif
 
package/libseccomp/libseccomp.mk +1 -1
@@ -15,7 +15,7 @@
 LIBSECCOMP_MAKE_ENV            = $(TARGET_CONFIGURE_OPTS)
 LIBSECCOMP_MAKE_OPTS            = SUBDIRS_BUILD=src
 LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
-LIBSECCOMP_INSTALL_TARGET_OPT  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
+LIBSECCOMP_INSTALL_TARGET_OPTS  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
 
 # Not a real autotools package, but works quite OK nonetheless
 $(eval $(autotools-package))
package/lvm2/lvm2.mk +1 -1
@@ -34,7 +34,7 @@
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
 LVM2_MAKE_OPTS = device-mapper
 LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
-LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
+LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper
 endif
 
 ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
package/mdadm/mdadm.mk +1 -1
@@ -13,7 +13,7 @@
 MDADM_MAKE_OPTS = \
 	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
 
-MDADM_INSTALL_TARGET_OPT = \
+MDADM_INSTALL_TARGET_OPTS = \
 	DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm
 
 define MDADM_CONFIGURE_CMDS
package/mxml/mxml.mk +1 -1
@@ -11,6 +11,6 @@
 MXML_INSTALL_STAGING = YES
 
 MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
-MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install
 
 $(eval $(autotools-package))
package/netsnmp/netsnmp.mk +1 -1
@@ -25,7 +25,7 @@
 		--with-out-transports="Unix" \
 		--disable-manuals
 NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
-NETSNMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
+NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
 NETSNMP_MAKE = $(MAKE1)
 NETSNMP_CONFIG_SCRIPTS = net-snmp-config
 
package/php/php.mk +1 -1
@@ -9,7 +9,7 @@
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
-PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
+PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
 PHP_DEPENDENCIES = host-pkgconf
 PHP_LICENSE = PHP
 PHP_LICENSE_FILES = LICENSE
package/pkg-autotools.mk +2 -2
@@ -109,7 +109,7 @@
 $(2)_MAKE_OPTS			?=
 $(2)_INSTALL_OPTS                ?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
+$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
 
 
 #
@@ -325,7 +325,7 @@
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
package/pkg-cmake.mk +2 -2
@@ -43,7 +43,7 @@
 $(2)_MAKE_OPTS			?=
 $(2)_INSTALL_HOST_OPT		?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR) install
+$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install
 
 $(2)_SRCDIR			= $$($(2)_DIR)/$$($(2)_SUBDIR)
 $(2)_BUILDDIR			= $$($(2)_SRCDIR)
@@ -144,7 +144,7 @@
 #
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
package/pkg-perl.mk +4 -4
@@ -156,9 +156,9 @@
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
 	cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
-		perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
+		perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
 	else \
-		$$(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
+		$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
 	fi
 endef
 endif
@@ -170,9 +170,9 @@
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
 	cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
-		perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
+		perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
 	else \
-		$$(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
+		$$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
 	fi
 endef
 endif
package/pkg-python.mk +6 -6
@@ -35,7 +35,7 @@
 PKG_PYTHON_DISTUTILS_BUILD_OPT = \
 	--executable=/usr/bin/python
 
-PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT = \
+PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
 	--prefix=$(TARGET_DIR)/usr
 
 PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
@@ -56,7 +56,7 @@
 	_python_prefix=/usr \
 	_python_exec_prefix=/usr
 
-PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT = \
+PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \
 	--prefix=$(TARGET_DIR)/usr \
 	--executable=/usr/bin/python \
 	--single-version-externally-managed \
@@ -112,7 +112,7 @@
 $(2)_BASE_ENV         = $$(PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
-$(2)_BASE_INSTALL_TARGET_OPT  = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT)
+$(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
@@ -126,7 +126,7 @@
 $(2)_BASE_ENV         = $$(PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   =
-$(2)_BASE_INSTALL_TARGET_OPT  = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT)
+$(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
@@ -254,8 +254,8 @@
 	(cd $$($$(PKG)_BUILDDIR)/; \
 		$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
 		$$($(2)_PYTHON_INTERPRETER) setup.py install \
-		$$($$(PKG)_BASE_INSTALL_TARGET_OPT) \
-		$$($$(PKG)_INSTALL_TARGET_OPT))
+		$$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \
+		$$($$(PKG)_INSTALL_TARGET_OPTS))
 endef
 endif
 
package/quota/quota.mk +1 -1
@@ -29,7 +29,7 @@
 	CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
 
 # Package uses autoconf but not automake.
-QUOTA_INSTALL_TARGET_OPT = \
+QUOTA_INSTALL_TARGET_OPTS = \
 	ROOTDIR=$(TARGET_DIR) \
 	install
 
package/rpm/rpm.mk +1 -1
@@ -47,6 +47,6 @@
 
 RPM_MAKE = $(MAKE1)
 
-RPM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) program_transform_name= install
+RPM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) program_transform_name= install
 
 $(eval $(autotools-package))
package/rubix/rubix.mk +1 -1
@@ -7,7 +7,7 @@
 RUBIX_VERSION = 1.0.5
 RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
 RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
-RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
+RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install
 RUBIX_LICENSE = Public Domain
 RUBIX_LICENSE_FILES = LICENCE
 
package/samba/samba.mk +1 -1
@@ -60,7 +60,7 @@
 	$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
 	$(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
 
-SAMBA_INSTALL_TARGET_OPT = \
+SAMBA_INSTALL_TARGET_OPTS = \
 	DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \
 	installlibs installservers installbin installscripts \
 	$(if $(BR2_PACKAGE_SAMBA_SWAT),installswat)
package/screen/screen.mk +1 -1
@@ -12,7 +12,7 @@
 SCREEN_AUTORECONF = YES
 SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)"
 SCREEN_MAKE = $(MAKE1)
-SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
+SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
 define SCREEN_INSTALL_SCREENRC
 	if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
package/sysstat/sysstat.mk +1 -1
@@ -19,6 +19,6 @@
 
 # The isag tool is a post processing script that depends on tcl/tk
 # among other things. So we don't install it.
-SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
+SYSSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
 
 $(eval $(autotools-package))
package/util-linux/util-linux.mk +1 -1
@@ -140,5 +140,5 @@
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
 # one, so it disappears
 UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
-UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+UTIL_LINUX_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
 HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
package/webkit/webkit.mk +1 -1
@@ -21,7 +21,7 @@
 
 # parallel make install deadlocks with make 3.81
 WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
-WEBKIT_INSTALL_TARGET_OPT = -j1 DESTDIR=$(TARGET_DIR) install
+WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
 
 # Does not build and it's disabled by default
 # in newer releases
package/x11r7/xapp_xcalc/xapp_xcalc.mk +1 -1
@@ -9,7 +9,7 @@
 XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XCALC_LICENSE = MIT
 XAPP_XCALC_LICENSE_FILES = COPYING
-XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
+XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data
 XAPP_XCALC_DEPENDENCIES = xlib_libXaw
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
 
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-alias/xfont_font-alias.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
 
 XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
 
 XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
 
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
 
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
 
 XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
 
 XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
 
 XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
 
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +1 -1
@@ -11,7 +11,7 @@
 XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
 
 XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
package/xenomai/xenomai.mk +1 -1
@@ -16,7 +16,7 @@
 XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
 
 XENOMAI_INSTALL_STAGING = YES
-XENOMAI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-user
+XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
 XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
 
 XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
package/xfsprogs/xfsprogs.mk +1 -1
@@ -16,6 +16,6 @@
 	INSTALL_USER=root \
 	INSTALL_GROUP=root
 
-XFSPROGS_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install
+XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
 
 $(eval $(autotools-package))
package/xscreensaver/xscreensaver.mk +1 -1
@@ -20,6 +20,6 @@
 	--includedir=$(STAGING_DIR)/usr/include \
 	--libdir=$(STAGING_DIR)/usr/lib
 
-XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install
+XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install
 
 $(eval $(autotools-package))
package/xterm/xterm.mk +1 -1
@@ -8,7 +8,7 @@
 XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
 XTERM_SITE = ftp://invisible-island.net/xterm
 XTERM_DEPENDENCIES = ncurses xlib_libXaw
-XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+XTERM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
 XTERM_LICENSE = MIT
 XTERM_LICENSE_FILES = version.c
 
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS

In reply to Yann E. MORIN

On 2014-09-28 00:05 +0200, Yann E. MORIN spake thusly:

Quoted 6 lines

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 3 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_OPT.

Quoted 7 lines
Quoted 4 lines

Sed command used:

   find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'

Casual visual review, plus:

    git difftool -y -x 'diff -du -I "_INSTALL_OPTS\?\>"' CSET^..CSET

So:

Regards,
Yann E. MORIN.

Quoted 169 lines
Quoted 157 lines

---
v2: rebase

 docs/manual/adding-packages-perl.txt   |   2 +-
 docs/manual/adding-packages-python.txt |   6 +++---
 package/gcc/gcc-initial/gcc-initial.mk |   2 +-
 package/pkg-autotools.mk               |   4 ++--
 package/pkg-python.mk                  |  12 ++++++------
 package/scons/scons.mk                 |   2 +-
 package/util-linux/util-linux.mk       |   2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
docs/manual/adding-packages-perl.txt +1 -1
@@ -113,6 +113,6 @@
   pass to +make pure_install+ or +perl Build install+ in the install step.
   By default, empty.
 
-* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to
+* +HOST_PERL_FOO_INSTALL_OPTS+, to specify additional options to
   pass to +make pure_install+ or +perl Build install+ in the install step.
   By default, empty.
docs/manual/adding-packages-python.txt +3 -3
@@ -128,16 +128,16 @@
   passed automatically by the infrastructure.
 
 * +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
-  +HOST_PYTHON_FOO_INSTALL_OPT+ to specify additional options to pass
+  +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
   to the Python +setup.py+ script during the target installation step,
   the staging installation step or the host installation,
   respectively. Note that the infrastructure is automatically passing
   some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
   or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
-  packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host
+  packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
   distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
   +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
-  packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for host
+  packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
   setuptools packages).
 
 * +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
package/gcc/gcc-initial/gcc-initial.mk +1 -1
@@ -54,6 +54,6 @@
 # support, as it can't guess it since the C library hasn't been built
 # yet (we're gcc-initial).
 HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
-HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
+HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc
 
 $(eval $(host-autotools-package))
package/pkg-autotools.mk +2 -2
@@ -107,7 +107,7 @@
 $(2)_CONF_OPT			?=
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_OPT                ?= install
+$(2)_INSTALL_OPTS                ?= install
 $(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPT		?= DESTDIR=$$(TARGET_DIR)  install
 
@@ -285,7 +285,7 @@
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR)
 endef
 endif
 
package/pkg-python.mk +6 -6
@@ -45,7 +45,7 @@
 HOST_PKG_PYTHON_DISTUTILS_ENV = \
 	PATH=$(BR_PATH)
 
-HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
+HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
 	--prefix=$(HOST_DIR)/usr
 
 # Target setuptools-based packages
@@ -72,7 +72,7 @@
 HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
 	PATH=$(BR_PATH)
 
-HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
+HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
 	--prefix=$(HOST_DIR)/usr
 
 ################################################################################
@@ -96,7 +96,7 @@
 
 $(2)_ENV         ?=
 $(2)_BUILD_OPT   ?=
-$(2)_INSTALL_OPT ?=
+$(2)_INSTALL_OPTS ?=
 
 ifndef $(2)_SETUP_TYPE
  ifdef $(3)_SETUP_TYPE
@@ -118,7 +118,7 @@
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
 endif
 # Setuptools
 else ifeq ($$($(2)_SETUP_TYPE),setuptools)
@@ -132,7 +132,7 @@
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
 endif
 else
 $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'")
@@ -241,7 +241,7 @@
 	(cd $$($$(PKG)_BUILDDIR)/; \
 		$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
 		$$($(2)_PYTHON_INTERPRETER) setup.py install \
-		$$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
+		$$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS))
 endef
 endif
 
package/scons/scons.mk +1 -1
@@ -12,7 +12,7 @@
 
 HOST_SCONS_NEEDS_HOST_PYTHON = python2
 
-HOST_SCONS_INSTALL_OPT = \
+HOST_SCONS_INSTALL_OPTS = \
 	--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
 
 $(eval $(host-python-package))
package/util-linux/util-linux.mk +1 -1
@@ -141,4 +141,4 @@
 # one, so it disappears
 UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
 UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
-HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#9 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_STAGING_OPT.

Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g'

Casual visaul review, plus:
git difftool -y -x 'diff -du -I "_INSTALL_STAGING_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 850 lines

---
v2: rebase

 docs/manual/adding-packages-autotools.txt                                                    |   2 +-
 docs/manual/adding-packages-cmake.txt                                                        |   2 +-
 docs/manual/adding-packages-python.txt                                                       |   6 ++--
 package/acl/acl.mk                                                                           |   2 +-
 package/atk/atk.mk                                                                           |   2 +-
 package/attr/attr.mk                                                                         |   2 +-
 package/cups/cups.mk                                                                         |   2 +-
 package/e2fsprogs/e2fsprogs.mk                                                               |   2 +-
 package/expat/expat.mk                                                                       |   2 +-
 package/glibc/glibc.mk                                                                       |   2 +-
 package/libdnet/libdnet.mk                                                                   |   2 +-
 package/libglib2/libglib2.mk                                                                 |   2 +-
 package/libseccomp/libseccomp.mk                                                             |   2 +-
 package/lite/lite.mk                                                                         |   2 +-
 package/lvm2/lvm2.mk                                                                         |   2 +-
 package/mxml/mxml.mk                                                                         |   2 +-
 package/netsnmp/netsnmp.mk                                                                   |   2 +-
 package/php/php.mk                                                                           |   2 +-
 package/pkg-autotools.mk                                                                     |   4 +-
 package/pkg-cmake.mk                                                                         |   4 +-
 package/pkg-python.mk                                                                        |  12 +++++-----
 package/tslib/tslib.mk                                                                       |   2 +-
 package/util-linux/util-linux.mk                                                             |   2 +-
 package/webkit/webkit.mk                                                                     |   2 +-
 package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk                             |   2 +-
 package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk                               |   2 +-
 package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk               |   2 +-
 package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk                 |   2 +-
 package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk                 |   2 +-
 package/x11r7/xfont_font-alias/xfont_font-alias.mk                                           |   2 +-
 package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk                               |   2 +-
 package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk                                   |   2 +-
 package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk                                     |   2 +-
 package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk |   2 +-
 package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk   |   2 +-
 package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk                                         |   2 +-
 package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk                                     |   2 +-
 package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk                     |   2 +-
 package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk                       |   2 +-
 package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk                       |   2 +-
 package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk                       |   2 +-
 package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk                               |   2 +-
 package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk                               |   2 +-
 package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk                                     |   2 +-
 package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk                                   |   2 +-
 package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk                                     |   2 +-
 package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk                                 |   2 +-
 package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk                           |   2 +-
 package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk                           |   2 +-
 package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk                               |   2 +-
 package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk                       |   2 +-
 package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk                       |   2 +-
 package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk                                   |   2 +-
 package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk                                     |   2 +-
 package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk                   |   2 +-
 package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk                           |   2 +-
 package/xenomai/xenomai.mk                                                                   |   2 +-
 60 files changed, 69 insertions(+), 69 deletions(-)
docs/manual/adding-packages-autotools.txt +1 -1
@@ -147,7 +147,7 @@
   not. Valid values are +YES+ and +NO+. By
   default, the value is +YES+
 
-* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options
+* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options
   used to install the package to the staging directory. By default, the
   value is +DESTDIR=$(STAGING_DIR) install+, which is
   correct for most autotools packages. It is still possible to override
docs/manual/adding-packages-cmake.txt +1 -1
@@ -112,7 +112,7 @@
   in the build step. These are passed after the +make+ command. By
   default, empty.
 
-* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options used to
+* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to
   install the package to the staging directory. By default, the value
   is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
   CMake packages. It is still possible to override it.
docs/manual/adding-packages-python.txt +3 -3
@@ -127,16 +127,16 @@
   packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
   passed automatically by the infrastructure.
 
-* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
+* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,
   +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
   to the Python +setup.py+ script during the target installation step,
   the staging installation step or the host installation,
   respectively. Note that the infrastructure is automatically passing
   some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+
-  or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
+  or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils
   packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
   distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or
-  +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
+  +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS+ (for target setuptools
   packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
   setuptools packages).
 
package/acl/acl.mk +1 -1
@@ -16,7 +16,7 @@
 # While the configuration system uses autoconf, the Makefiles are
 # hand-written and do not use automake. Therefore, we have to hack
 # around their deficiencies by passing installation paths.
-ACL_INSTALL_STAGING_OPT = 			\
+ACL_INSTALL_STAGING_OPTS = 			\
 	prefix=$(STAGING_DIR)/usr 		\
 	exec_prefix=$(STAGING_DIR)/usr 		\
 	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib	\
package/atk/atk.mk +1 -1
@@ -11,7 +11,7 @@
 ATK_LICENSE = LGPLv2+
 ATK_LICENSE_FILES = COPYING
 ATK_INSTALL_STAGING = YES
-ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
 		glib_cv_stack_grows=no glib_cv_uscore=no \
package/attr/attr.mk +1 -1
@@ -15,7 +15,7 @@
 # While the configuration system uses autoconf, the Makefiles are
 # hand-written and do not use automake. Therefore, we have to hack
 # around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPT = 			\
+ATTR_INSTALL_STAGING_OPTS = 			\
 	prefix=$(STAGING_DIR)/usr 		\
 	exec_prefix=$(STAGING_DIR)/usr 		\
 	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib 	\
package/cups/cups.mk +1 -1
@@ -10,7 +10,7 @@
 CUPS_LICENSE = GPLv2 LGPLv2
 CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
-CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
+CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
 CUPS_CONF_OPT = --without-perl \
 		--without-java \
package/e2fsprogs/e2fsprogs.mk +1 -1
@@ -9,7 +9,7 @@
 E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
 E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
 E2FSPROGS_INSTALL_STAGING = YES
-E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs
+E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
 
 E2FSPROGS_CONF_OPT = \
 	$(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
package/expat/expat.mk +1 -1
@@ -7,7 +7,7 @@
 EXPAT_VERSION = 2.1.0
 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
 EXPAT_INSTALL_STAGING = YES
-EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
+EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib
 EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkgconf
 EXPAT_LICENSE = MIT
package/glibc/glibc.mk +1 -1
@@ -30,7 +30,7 @@
 
 GLIBC_INSTALL_STAGING = YES
 
-GLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
+GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install
 
 # Thumb build is broken, build in ARM mode
 ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
package/libdnet/libdnet.mk +1 -1
@@ -19,7 +19,7 @@
 LIBDNET_CONF_OPT += --with-python
 LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
 LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
-LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
+LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
 endif
 
 # Needed for autoreconf to work properly
package/libglib2/libglib2.mk +1 -1
@@ -13,7 +13,7 @@
 
 LIBGLIB2_AUTORECONF = YES
 LIBGLIB2_INSTALL_STAGING = YES
-LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 LIBGLIB2_CONF_ENV = \
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
package/libseccomp/libseccomp.mk +1 -1
@@ -14,7 +14,7 @@
 LIBSECCOMP_CONF_ENV            = SYSROOT=$(STAGING_DIR)
 LIBSECCOMP_MAKE_ENV            = $(TARGET_CONFIGURE_OPTS)
 LIBSECCOMP_MAKE_OPTS            = SUBDIRS_BUILD=src
-LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
+LIBSECCOMP_INSTALL_STAGING_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
 LIBSECCOMP_INSTALL_TARGET_OPTS  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
 
 # Not a real autotools package, but works quite OK nonetheless
package/lite/lite.mk +1 -1
@@ -8,7 +8,7 @@
 LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz
 LITE_SITE = http://www.directfb.org/downloads/Libs
 LITE_INSTALL_STAGING = YES
-LITE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
 LITE_DEPENDENCIES = directfb
 LITE_LICENSE = LGPLv2.1+
package/lvm2/lvm2.mk +1 -1
@@ -33,7 +33,7 @@
 
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
 LVM2_MAKE_OPTS = device-mapper
-LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
+LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper
 LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper
 endif
 
package/mxml/mxml.mk +1 -1
@@ -10,7 +10,7 @@
 MXML_LICENSE_FILES = COPYING
 MXML_INSTALL_STAGING = YES
 
-MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
+MXML_INSTALL_STAGING_OPTS = DSTROOT=$(STAGING_DIR) install
 MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install
 
 $(eval $(autotools-package))
package/netsnmp/netsnmp.mk +1 -1
@@ -24,7 +24,7 @@
 		--with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
 		--with-out-transports="Unix" \
 		--disable-manuals
-NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
+NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
 NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
 NETSNMP_MAKE = $(MAKE1)
 NETSNMP_CONFIG_SCRIPTS = net-snmp-config
package/php/php.mk +1 -1
@@ -8,7 +8,7 @@
 PHP_SITE = http://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
-PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
+PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
 PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
 PHP_DEPENDENCIES = host-pkgconf
 PHP_LICENSE = PHP
package/pkg-autotools.mk +2 -2
@@ -108,7 +108,7 @@
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
 $(2)_INSTALL_OPTS                ?= install
-$(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
 
 
@@ -309,7 +309,7 @@
 #
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_SRCDIR)
 	find $$(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
 		$$(SED) "s:$$(BASE_DIR):@BASE_DIR@:g" \
 			-e "s:$$(STAGING_DIR):@STAGING_DIR@:g" \
package/pkg-cmake.mk +2 -2
@@ -42,7 +42,7 @@
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
 $(2)_INSTALL_HOST_OPT		?= install
-$(2)_INSTALL_STAGING_OPT	?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install
 
 $(2)_SRCDIR			= $$($(2)_DIR)/$$($(2)_SUBDIR)
@@ -134,7 +134,7 @@
 #
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
package/pkg-python.mk +6 -6
@@ -38,7 +38,7 @@
 PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
 	--prefix=$(TARGET_DIR)/usr
 
-PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
+PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
 	--prefix=$(STAGING_DIR)/usr
 
 # Host distutils-based packages
@@ -62,7 +62,7 @@
 	--single-version-externally-managed \
 	--root=/
 
-PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT = \
+PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
 	--prefix=$(STAGING_DIR)/usr \
 	--executable=/usr/bin/python \
 	--single-version-externally-managed \
@@ -113,7 +113,7 @@
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
 $(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
-$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
+$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
@@ -127,7 +127,7 @@
 $(2)_BASE_BUILD_TGT   = build
 $(2)_BASE_BUILD_OPT   =
 $(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
-$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
+$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
@@ -268,8 +268,8 @@
 	(cd $$($$(PKG)_BUILDDIR)/; \
 		$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
 		$$($(2)_PYTHON_INTERPRETER) setup.py install \
-		$$($$(PKG)_BASE_INSTALL_STAGING_OPT) \
-		$$($$(PKG)_INSTALL_STAGING_OPT))
+		$$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \
+		$$($$(PKG)_INSTALL_STAGING_OPTS))
 endef
 endif
 
package/tslib/tslib.mk +1 -1
@@ -11,6 +11,6 @@
 
 TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
-TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+TSLIB_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
 $(eval $(autotools-package))
package/util-linux/util-linux.mk +1 -1
@@ -139,6 +139,6 @@
 
 # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
 # one, so it disappears
-UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+UTIL_LINUX_INSTALL_STAGING_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
 UTIL_LINUX_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
 HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
package/webkit/webkit.mk +1 -1
@@ -20,7 +20,7 @@
 WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
 
 # parallel make install deadlocks with make 3.81
-WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
+WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
 WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
 
 # Does not build and it's disabled by default
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ADOBE_100DPI_LICENSE = MIT
 XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ADOBE_75DPI_LICENSE = MIT
 XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-alias/xfont_font-alias.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ALIAS_LICENSE = MIT
 XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
 
-XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ARABIC_MISC_LICENSE = MIT
 XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT
 XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT
 XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT
 XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered
 XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1 -1
@@ -9,7 +9,7 @@
 XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_DEC_MISC_LICENSE = MIT
 XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification)
 XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_ISAS_MISC_LICENSE = MIT
 XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1 -1
@@ -9,7 +9,7 @@
 XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_MICRO_MISC_LICENSE = Public Domain
 XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain
 XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT
 XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License
 XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_MISC_MISC_LICENSE = Public Domain
 XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_MUTT_MISC_LICENSE = MIT
 XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT
 XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_SONY_MISC_LICENSE = MIT
 XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_SUN_MISC_LICENSE = MIT
 XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +1 -1
@@ -10,7 +10,7 @@
 XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT
 XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
 XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
package/xenomai/xenomai.mk +1 -1
@@ -17,7 +17,7 @@
 
 XENOMAI_INSTALL_STAGING = YES
 XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
-XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
+XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
 
 XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
 
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#11 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_HOST_OPT.

Sed command used:

   find * -type f | xargs sed -i 's#_INSTALL_HOST_OPT\>#&S#g'

However, I have a comment that is not related to this change...

Quoted 10 lines

---
v2: rebase

 package/pkg-cmake.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

package/pkg-cmake.mk line 44

Quoted 5 lines
package/pkg-cmake.mk +1 -1
@@ -41,7 +41,7 @@
 $(2)_MAKE			?= $$(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_HOST_OPT		?= install
+$(2)_INSTALL_HOST_OPTS		?= install

The other infras do not use a 'HOST_' in the middle of host-variant variables; 'HOST_' is only present at the beginning.

For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.

So, I find there is a bit of discrepancy in this variable naming. Plus, it is not documented in the manual.

Samuel, is there a reason for the naming of this variable?

Regards,
Yann E. MORIN.

Quoted 12 lines
package/pkg-cmake.mk +1 -1
 $(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
 $(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install
 
@@ -124,7 +124,7 @@
 #
 ifndef $(2)_INSTALL_CMDS
 define $(2)_INSTALL_CMDS
-	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
+	$$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPTS) -C $$($$(PKG)_BUILDDIR)
 endef
 endif
 
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#16 lore raw

PATCH 1/1 packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_AUTORECONF_OPT.

Sed command used:
find * -type f | xargs sed -i 's#_AUTORECONF_OPT\>#&S#g'

Casual inspection, plus:

    git difftool -y -x 'diff -du -I "_AUTORECONF_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 79 lines

---
v2: rebase

 docs/manual/adding-packages-autotools.txt               |  2 +-
 package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk    |  2 +-
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk |  2 +-
 package/pkg-autotools.mk                                |  4 ++--
 package/webkit/webkit.mk                                |  2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
docs/manual/adding-packages-autotools.txt +1 -1
@@ -126,7 +126,7 @@
   +LIBFOO_AUTORECONF=YES+. These are passed in the environment of
   the 'autoreconf' command. By default, empty.
 
-* +LIBFOO_AUTORECONF_OPT+ to specify additional options
+* +LIBFOO_AUTORECONF_OPTS+ to specify additional options
   passed to the 'autoreconf' program if
   +LIBFOO_AUTORECONF=YES+. By default, empty.
 
package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +1 -1
@@ -12,7 +12,7 @@
 
 # There is no generated configure script in the tarball.
 GST_PLUGIN_X170_AUTORECONF = YES
-GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/
+GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/
 GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs
 
 $(eval $(autotools-package))
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1 -1
@@ -13,7 +13,7 @@
 GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
 
 GST1_PLUGINS_BAD_AUTORECONF = YES
-GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4
+GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4
 GST1_PLUGINS_BAD_GETTEXTIZE = YES
 
 GST1_PLUGINS_BAD_CONF_OPT = \
package/pkg-autotools.mk +2 -2
@@ -100,7 +100,7 @@
 endif
 
 ifeq ($(4),host)
- $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT)
+ $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
 endif
 
 $(2)_CONF_ENV			?=
@@ -228,7 +228,7 @@
 #
 define AUTORECONF_HOOK
 	@$$(call MESSAGE,"Autoreconfiguring")
-	$$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
+	$$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS)
 	$$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
 			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
package/webkit/webkit.mk +1 -1
@@ -17,7 +17,7 @@
 
 # webkit-disable-tests.patch changes configure.ac therefore autoreconf required
 WEBKIT_AUTORECONF = YES
-WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
+WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools
 
 # parallel make install deadlocks with make 3.81
 WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#18 lore raw

PATCH 1/1 packages: rename FOO_CONF_OPT into FOO_CONF_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT.

Sed command used:

   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Casual visual inspection, plus:

    git difftool -y -x 'diff -du -I "_CONF_OPTS\?\>"' CSET^..CSET

(Note: stripped entire patch from reply, too big for the list)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#20 lore raw

PATCH 1/1 packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_BUILD_OPT.

Sed command used:

   find * -type f | xargs sed -i 's#_BUILD_OPT\>#&S#g'

Causual visual review, plus:

    git difftool -y -x 'diff -du -I "_BUILD_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 184 lines

---
v2: rebase

 docs/manual/adding-packages-luarocks.txt |   6 +++---
 docs/manual/adding-packages-perl.txt     |   2 +-
 docs/manual/adding-packages-python.txt   |   4 ++--
 package/pkg-luarocks.mk                  |   4 ++--
 package/pkg-perl.mk                      |   8 ++++----
 package/pkg-python.mk                    |  14 +++++++-------
 package/python-numpy/python-numpy.mk     |   2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)
docs/manual/adding-packages-luarocks.txt +3 -3
@@ -20,8 +20,8 @@
 07: LUAFOO_VERSION = 1.0.2-1
 08: LUAFOO_DEPENDENCIES = foo
 09:
-10: LUAFOO_BUILD_OPT += FOO_INCDIR=$(STAGING_DIR)/usr/include
-11: LUAFOO_BUILD_OPT += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
+10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
+11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
 12: LUAFOO_LICENSE = luaFoo license
 13: LUAFOO_LICENSE_FILES = COPYING
 14:
@@ -86,5 +86,5 @@
 * +LUAFOO_SUBDIR+, which defaults to
   +luafoo-$(LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)+
 
-* +LUAFOO_BUILD_OPT+ contains additional build options for the
+* +LUAFOO_BUILD_OPTS+ contains additional build options for the
   +luarocks build+ call.
docs/manual/adding-packages-perl.txt +1 -1
@@ -105,7 +105,7 @@
   configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
   By default, empty.
 
-* +PERL_FOO_BUILD_OPT+/+HOST_PERL_FOO_BUILD_OPT+, to specify additional
+* +PERL_FOO_BUILD_OPTS+/+HOST_PERL_FOO_BUILD_OPTS+, to specify additional
   options to pass to +make pure_all+ or +perl Build build+ in the build step.
   By default, empty.
 
docs/manual/adding-packages-python.txt +2 -2
@@ -122,9 +122,9 @@
   setuptools target packages) and +HOST_PKG_PYTHON_SETUPTOOLS_ENV+
   (for setuptools host packages).
 
-* +PYTHON_FOO_BUILD_OPT+, to specify additional options to pass to the
+* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to the
   Python +setup.py+ script during the build step. For target distutils
-  packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
+  packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ options are already
   passed automatically by the infrastructure.
 
 * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,
package/pkg-luarocks.mk +2 -2
@@ -33,7 +33,7 @@
 
 define inner-luarocks-package
 
-$(2)_BUILD_OPT		?=
+$(2)_BUILD_OPTS		?=
 $(2)_SUBDIR		?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
 $(2)_ROCKSPEC		?= $(1)-$$($(3)_VERSION).rockspec
 $(2)_SOURCE		?= $(1)-$$($(3)_VERSION).src.rock
@@ -59,7 +59,7 @@
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
 	cd $$($(2)_SRCDIR) && \
-	 $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPT)
+	 $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
 endef
 endif
 
package/pkg-perl.mk +4 -4
@@ -129,11 +129,11 @@
 # Build package for target
 define $(2)_BUILD_CMDS
 	cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
-		perl Build $$($(2)_BUILD_OPT) build; \
+		perl Build $$($(2)_BUILD_OPTS) build; \
 	else \
 		$$(MAKE1) \
 			PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
-			$$($(2)_BUILD_OPT) pure_all; \
+			$$($(2)_BUILD_OPTS) pure_all; \
 	fi
 endef
 else
@@ -141,9 +141,9 @@
 # Build package for host
 define $(2)_BUILD_CMDS
 	cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
-		perl Build $$($(2)_BUILD_OPT) build; \
+		perl Build $$($(2)_BUILD_OPTS) build; \
 	else \
-		$$(MAKE1) $$($(2)_BUILD_OPT) pure_all; \
+		$$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
 	fi
 endef
 endif
package/pkg-python.mk +7 -7
@@ -32,7 +32,7 @@
 	_python_prefix=/usr \
 	_python_exec_prefix=/usr
 
-PKG_PYTHON_DISTUTILS_BUILD_OPT = \
+PKG_PYTHON_DISTUTILS_BUILD_OPTS = \
 	--executable=/usr/bin/python
 
 PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
@@ -95,7 +95,7 @@
 $(2)_BUILDDIR	= $$($(2)_SRCDIR)
 
 $(2)_ENV         ?=
-$(2)_BUILD_OPT   ?=
+$(2)_BUILD_OPTS   ?=
 $(2)_INSTALL_OPTS ?=
 
 ifndef $(2)_SETUP_TYPE
@@ -111,13 +111,13 @@
 ifeq ($(4),target)
 $(2)_BASE_ENV         = $$(PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
+$(2)_BASE_BUILD_OPTS   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
 $(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   =
+$(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
 endif
 # Setuptools
@@ -125,13 +125,13 @@
 ifeq ($(4),target)
 $(2)_BASE_ENV         = $$(PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   =
+$(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
 else
 $(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
 $(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPT   =
+$(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
 endif
 else
@@ -228,7 +228,7 @@
 		$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
 		$$($(2)_PYTHON_INTERPRETER) setup.py \
 		$$($$(PKG)_BASE_BUILD_TGT) \
-		$$($$(PKG)_BASE_BUILD_OPT) $$($$(PKG)_BUILD_OPT))
+		$$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS))
 endef
 endif
 
package/python-numpy/python-numpy.mk +1 -1
@@ -16,7 +16,7 @@
 PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack
 endif
 
-PYTHON_NUMPY_BUILD_OPT = --fcompiler=None
+PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None
 
 define PYTHON_NUMPY_CONFIGURE_CMDS
 	-rm -f $(@D)/site.cfg
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#22 lore raw

PATCH 1/1 packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_GETTEXTIZE_OPT.

Sed command used:
find * -type f | xargs sed -i 's#_GETTEXTIZE_OPT\>#&S#g'

Regards,
Yann E. MORIN.

Quoted 40 lines

---
v2: rebase

 docs/manual/adding-packages-autotools.txt |  2 +-
 package/pkg-autotools.mk                  |  4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
docs/manual/adding-packages-autotools.txt +1 -1
@@ -136,7 +136,7 @@
   'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid
   values are +YES+ and +NO+. The default is +NO+.
 
-* +LIBFOO_GETTEXTIZE_OPT+, to specify additional options passed to
+* +LIBFOO_GETTEXTIZE_OPTS+, to specify additional options passed to
   the 'gettextize' program, if +LIBFOO_GETTEXTIZE=YES+. You may
   use that if, for example, the +.po+ files are not located in the
   standard place (i.e. in +po/+ at the root of the package.) By
package/pkg-autotools.mk +2 -2
@@ -96,7 +96,7 @@
 endif
 
 ifeq ($(4),host)
- $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT)
+ $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS)
 endif
 
 ifeq ($(4),host)
@@ -220,7 +220,7 @@
 #
 define GETTEXTIZE_HOOK
 	@$$(call MESSAGE,"Gettextizing")
-	$(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT)
+	$(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS)
 endef
 
 #
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#24 lore raw

PATCH 1/1 packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_KCONFIG_OPT.

Sed command used:

   find * -type f | xargs sed -i 's#_KCONFIG_OPT\>#&S#g'

Regards,
Yann E. MORIN.

Quoted 75 lines

---
v2: new patch

 docs/manual/adding-packages-kconfig.txt |  2 +-
 package/busybox/busybox.mk              |  2 +-
 package/pkg-kconfig.mk                  |  6 +++---
 package/uclibc/uclibc.mk                |  2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
docs/manual/adding-packages-kconfig.txt +1 -1
@@ -46,7 +46,7 @@
 * +FOO_KCONFIG_EDITORS+: a space-separated list of kconfig editors to
   support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
 
-* +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
+* +FOO_KCONFIG_OPTS+: extra options to pass when calling the kconfig
   editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
   default, empty.
 
package/busybox/busybox.mk +1 -1
@@ -47,7 +47,7 @@
 
 BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
 BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
-BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS)
+BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
 
 define BUSYBOX_PERMISSIONS
 /bin/busybox			 f 4755	0 0 - - - - -
package/pkg-kconfig.mk +3 -3
@@ -33,7 +33,7 @@
 
 # Default values
 $(2)_KCONFIG_EDITORS ?= menuconfig
-$(2)_KCONFIG_OPT ?=
+$(2)_KCONFIG_OPTS ?=
 $(2)_KCONFIG_FIXUP_CMDS ?=
 
 # FOO_KCONFIG_FILE is required
@@ -51,7 +51,7 @@
 $$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
 	$$($(2)_KCONFIG_FIXUP_CMDS)
 	@yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
-		$$($(2)_KCONFIG_OPT) oldconfig
+		$$($(2)_KCONFIG_OPTS) oldconfig
 	$$(Q)touch $$@
 
 # Before running configure, the configuration file should be present and fixed
@@ -60,7 +60,7 @@
 # Configuration editors (menuconfig, ...)
 $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.stamp_kconfig_fixup_done
 	$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
-		$$($(2)_KCONFIG_OPT) $$(subst $(1)-,,$$@)
+		$$($(2)_KCONFIG_OPTS) $$(subst $(1)-,,$$@)
 	rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
 	rm -f $$($(2)_DIR)/.stamp_{target,staging}_installed
 
package/uclibc/uclibc.mk +1 -1
@@ -39,7 +39,7 @@
 
 UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
 
-UCLIBC_KCONFIG_OPT = \
+UCLIBC_KCONFIG_OPTS = \
 		$(UCLIBC_MAKE_FLAGS) \
 		PREFIX=$(STAGING_DIR) \
 		DEVEL_PREFIX=/usr/ \
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#35 lore raw

PATCH 1/1 packages: rename misc. occurrences of _OPT into _OPTS

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 4 lines

To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, change remaining occurrences of _OPT into _OPTS.

Visual review, plus:

    git difftool -y -x 'diff -du -I "_OPTS\?\>"' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 336 lines

---
v2: rebase

 linux/linux-ext-xenomai.mk                  |   6 +-
 package/boost/boost.mk                      |  14 +++---
 package/dhcpcd/dhcpcd.mk                    |   8 +-
 package/freetype/freetype.mk                |   2 +-
 package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk  |  40 +++++++++---------
 package/gstreamer1/gst1-libav/gst1-libav.mk |  44 ++++++++++----------
 6 files changed, 57 insertions(+), 57 deletions(-)
linux/linux-ext-xenomai.mk +3 -3
@@ -11,9 +11,9 @@
 # Adeos patch version
 XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
 ifeq ($(XENOMAI_ADEOS_PATCH),)
-XENOMAI_ADEOS_OPT = --default
+XENOMAI_ADEOS_OPTS = --default
 else
-XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
+XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
 endif
 
 # Prepare kernel patch
@@ -21,7 +21,7 @@
 	$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
 		--linux=$(LINUX_DIR) \
 		--arch=$(KERNEL_ARCH) \
-		$(XENOMAI_ADEOS_OPT) \
+		$(XENOMAI_ADEOS_OPTS) \
 		--verbose
 endef
 
package/boost/boost.mk +7 -7
@@ -77,7 +77,7 @@
 endif
 endif
 
-HOST_BOOST_OPT += toolset=gcc threading=multi variant=release link=shared \
+HOST_BOOST_OPTS += toolset=gcc threading=multi variant=release link=shared \
 	runtime-link=shared
 
 ifeq ($(BR2_MIPS_OABI32),y)
@@ -88,7 +88,7 @@
 BOOST_ABI = sysv
 endif
 
-BOOST_OPT += toolset=gcc \
+BOOST_OPTS += toolset=gcc \
 	     threading=multi \
 	     abi=$(BOOST_ABI) \
 	     variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
@@ -98,7 +98,7 @@
 ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 # posix backend needs monetary.h which isn't available on uClibc
-BOOST_OPT += boost.locale.posix=off
+BOOST_OPTS += boost.locale.posix=off
 endif
 
 BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv)
@@ -123,7 +123,7 @@
 define BOOST_INSTALL_TARGET_CMDS
 	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
 	--user-config=$(@D)/user-config.jam \
-	$(BOOST_OPT) \
+	$(BOOST_OPTS) \
 	--prefix=$(TARGET_DIR)/usr \
 	--layout=$(BOOST_LAYOUT) install )
 endef
@@ -131,14 +131,14 @@
 define HOST_BOOST_BUILD_CMDS
 	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
 	--user-config=$(@D)/user-config.jam \
-	$(HOST_BOOST_OPT) \
+	$(HOST_BOOST_OPTS) \
 	--prefix=$(HOST_DIR)/usr )
 endef
 
 define HOST_BOOST_INSTALL_CMDS
 	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
 	--user-config=$(@D)/user-config.jam \
-	$(HOST_BOOST_OPT) \
+	$(HOST_BOOST_OPTS) \
 	--prefix=$(HOST_DIR)/usr \
 	--layout=$(BOOST_LAYOUT) install )
 endef
@@ -146,7 +146,7 @@
 define BOOST_INSTALL_STAGING_CMDS
 	(cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+1 \
 	--user-config=$(@D)/user-config.jam \
-	$(BOOST_OPT) \
+	$(BOOST_OPTS) \
 	--prefix=$(STAGING_DIR)/usr \
 	--layout=$(BOOST_LAYOUT) install)
 endef
package/dhcpcd/dhcpcd.mk +4 -4
@@ -11,15 +11,15 @@
 DHCPCD_LICENSE = BSD-2c
 
 ifeq ($(BR2_INET_IPV6),)
-	DHCPCD_CONFIG_OPT += --disable-ipv6
+	DHCPCD_CONFIG_OPTS += --disable-ipv6
 endif
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)
-	DHCPCD_CONFIG_OPT += --enable-static
+	DHCPCD_CONFIG_OPTS += --enable-static
 endif
 
 ifeq ($(BR2_USE_MMU),)
-	DHCPCD_CONFIG_OPT += --disable-fork
+	DHCPCD_CONFIG_OPTS += --disable-fork
 endif
 
 define DHCPCD_CONFIGURE_CMDS
@@ -27,7 +27,7 @@
 	$(TARGET_CONFIGURE_OPTS) ./configure \
 		--target=$(BR2_GCC_TARGET_ARCH) \
 		--os=linux \
-		$(DHCPCD_CONFIG_OPT) )
+		$(DHCPCD_CONFIG_OPTS) )
 endef
 
 define DHCPCD_BUILD_CMDS
package/freetype/freetype.mk +1 -1
@@ -20,7 +20,7 @@
 # Regen required because the tarball ships with an experimental ltmain.sh
 # that can't be patched by our infra.
 # autogen.sh is because autotools stuff lives in other directories and
-# even AUTORECONF with _OPT doesn't do it properly.
+# even AUTORECONF with _OPTS doesn't do it properly.
 # POST_PATCH is because we still need to patch libtool after the regen.
 define FREETYPE_RUN_AUTOGEN
 	cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +20 -20
@@ -10,69 +10,69 @@
 GST_FFMPEG_INSTALL_STAGING = YES
 GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
 
-GST_FFMPEG_CONF_EXTRA_OPT = \
+GST_FFMPEG_CONF_EXTRA_OPTS = \
 		--cross-prefix=$(TARGET_CROSS) \
 		--target-os=linux
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-zlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
 GST_FFMPEG_DEPENDENCIES += zlib
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-zlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-bzlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib
 GST_FFMPEG_DEPENDENCIES += bzip2
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-bzlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-yasm
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm
 GST_FFMPEG_DEPENDENCIES += host-yasm
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-yasm
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-mmx
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-sse
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-sse
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-ssse3
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-ssse3
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3
 endif
 
 # Explicitly disable everything that doesn't match for ARM
 # FFMPEG "autodetects" by compiling an extended instruction via AS
 # This works on compilers that aren't built for generic by default
 ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv5te
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te
 endif
 ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-armv6
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv6 --disable-armv6t2
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
 endif
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-neon
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon
 endif
 
 ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-altivec
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec
 else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-altivec
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec
 endif
 
 ifeq ($(BR2_PREFER_STATIC_LIB),)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-pic
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
 endif
 
-GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
+GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
 
 $(eval $(autotools-package))
package/gstreamer1/gst1-libav/gst1-libav.mk +22 -22
@@ -10,74 +10,74 @@
 
 GST1_LIBAV_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base
 
-GST1_LIBAV_CONF_EXTRA_OPT = \
+GST1_LIBAV_CONF_EXTRA_OPTS = \
 	--cross-prefix=$(TARGET_CROSS) \
 	--target-os=linux \
 	$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-zlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib
 GST1_LIBAV_DEPENDENCIES += zlib
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-zlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-bzlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-bzlib
 GST1_LIBAV_DEPENDENCIES += bzip2
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-bzlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-yasm
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-yasm
 GST1_LIBAV_DEPENDENCIES += host-yasm
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-yasm
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-mmx
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-yasm
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mmx
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-sse
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-sse
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-sse
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-sse
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-ssse3
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-ssse3
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-ssse3
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-ssse3
 endif
 
 # Explicitly disable everything that doesn't match for ARM
 # FFMPEG "autodetects" by compiling an extended instruction via AS
 # This works on compilers that aren't built for generic by default
 ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv5te
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv5te
 endif
 ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-armv6
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-armv6
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv6 --disable-armv6t2
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
 endif
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-neon
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-neon
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-neon
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-neon
 endif
 ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-vfp
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-vfp
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-vfp
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-vfp
 endif
 
 ifeq ($(BR2_POWERPC_CPU_HASH_ALTIVEC),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-altivec
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-altivec
 else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-altivec
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-altivec
 endif
 
 GST1_LIBAV_CONF_OPTS = \
-	--with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPT)"
+	--with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)"
 
 $(eval $(autotools-package))
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#37 lore raw

PATCH 1/1 .mk files: remove alignment of line continuation characters

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 7 lines

The Buildroot coding style does not align assignments nor line continuation characters (\). This patch updates the .mk files to reflect this.

Command used:

    find * -name "*.mk" | xargs sed -i 's/\s\+\\\s*$/ \\/g'

Casual visual inspection, plus:
git difftool -y -x 'diff -dub' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 1,871 lines

---
v2: new patch

 boot/lpc32xxcdl/lpc32xxcdl.mk                            |    8 +-
 boot/uboot/uboot.mk                                      |    8 +-
 linux/linux-ext-rtai.mk                                  |   10 +-
 linux/linux-ext-xenomai.mk                               |    6 +-
 linux/linux.mk                                           |   14 +-
 package/acl/acl.mk                                       |   14 +-
 package/attr/attr.mk                                     |   14 +-
 package/bluez5_utils/bluez5_utils.mk                     |    6 +-
 package/bluez_utils/bluez_utils.mk                       |   24 +-
 package/boost/boost.mk                                   |   14 +-
 package/cegui06/cegui06.mk                               |   32 +-
 package/celt051/celt051.mk                               |   14 +-
 package/connman/connman.mk                               |   10 +-
 package/dhcpcd/dhcpcd.mk                                 |    8 +-
 package/directfb/directfb.mk                             |    2 +-
 package/dtc/dtc.mk                                       |    4 +-
 package/duma/duma.mk                                     |    4 +-
 package/efl/libecore/libecore.mk                         |   12 +-
 package/enlightenment/enlightenment.mk                   |   24 +-
 package/eudev/eudev.mk                                   |   16 +-
 package/ffmpeg/ffmpeg.mk                                 |    4 +-
 package/freetype/freetype.mk                             |    2 +-
 package/glibc/glibc.mk                                   |    4 +-
 package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk               |   40 +-
 package/gstreamer1/gst1-libav/gst1-libav.mk              |   44 +-
 package/gvfs/gvfs.mk                                     |   16 +-
 package/jack2/jack2.mk                                   |    6 +-
 package/keyutils/keyutils.mk                             |   10 +-
 package/lesstif/lesstif.mk                               |    2 +-
 package/libungif/libungif.mk                             |    6 +-
 package/linux-firmware/linux-firmware.mk                 |   62 ++--
 package/midori/midori.mk                                 |    6 +-
 package/mplayer/mplayer.mk                               |    6 +-
 package/ngrep/ngrep.mk                                   |    2 +-
 package/opencv/opencv.mk                                 |  116 +++++-----
 package/openocd/openocd.mk                               |    8 +-
 package/pkg-generic.mk                                   |    4 +-
 package/poco/poco.mk                                     |   40 +-
 package/python/python.mk                                 |   52 ++--
 package/python3/python3.mk                               |   42 +-
 package/qemu/qemu.mk                                     |   16 +-
 package/rt-tests/rt-tests.mk                             |   12 +-
 package/rtai/rtai.mk                                     |    6 +-
 package/samba/samba.mk                                   |    8 +-
 package/spice/spice.mk                                   |   24 +-
 package/squashfs/squashfs.mk                             |   16 +-
 package/strongswan/strongswan.mk                         |   86 +++---
 package/systemd/systemd.mk                               |   12 +-
 package/tvheadend/tvheadend.mk                           |   20 +-
 package/tz/tz.mk                                         |   18 +-
 package/tzdata/tzdata.mk                                 |   18 +-
 package/uboot-tools/uboot-tools.mk                       |   26 +-
 package/udisks/udisks.mk                                 |   18 +-
 package/usbmount/usbmount.mk                             |    4 +-
 package/vde2/vde2.mk                                     |   12 +-
 package/wpa_supplicant/wpa_supplicant.mk                 |   10 +-
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk |   84 +++---
 package/xbmc/xbmc.mk                                     |    2 +-
 58 files changed, 554 insertions(+), 554 deletions(-)
boot/lpc32xxcdl/lpc32xxcdl.mk +4 -4
@@ -33,10 +33,10 @@
 endif
 
 LPC32XXCDL_BUILD_FLAGS = \
-	CROSS_COMPILE=$(TARGET_CROSS)           \
-	NXPMCU_WINBASE=$(@D)                    \
-	NXPMCU_SOFTWARE=$(@D)                   \
-	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME)  \
+	CROSS_COMPILE=$(TARGET_CROSS) \
+	NXPMCU_WINBASE=$(@D) \
+	NXPMCU_SOFTWARE=$(@D) \
+	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
 	CSP=lpc32xx TOOL=gnu GEN=lpc
 
 LPC32XXCDL_BOARD_STARTUP_DIR = \
boot/uboot/uboot.mk +4 -4
@@ -95,8 +95,8 @@
 endif
 
 define UBOOT_CONFIGURE_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS)		\
+	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
 		$(UBOOT_BOARD_NAME)_config
 	@echo >> $(@D)/include/config.h
 	@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
@@ -114,8 +114,8 @@
 endef
 
 define UBOOT_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) 	\
-		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
+	$(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
 		$(UBOOT_MAKE_TARGET)
 endef
 
linux/linux-ext-rtai.mk +5 -5
@@ -25,8 +25,8 @@
 define RTAI_PREPARE_KERNEL
 	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
 	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
-		support/scripts/apply-patches.sh $(LINUX_DIR) 		\
-			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\
+		support/scripts/apply-patches.sh $(LINUX_DIR) \
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
 			hal-linux-$${kver}-*patch ; \
 	else \
 		echo "No RTAI patch for your kernel version" ; \
@@ -35,9 +35,9 @@
 endef
 else
 define RTAI_PREPARE_KERNEL
-	support/scripts/apply-patches.sh 	\
-		$(LINUX_DIR)			\
-		$(dir $(RTAI_PATCH))		\
+	support/scripts/apply-patches.sh \
+		$(LINUX_DIR) \
+		$(dir $(RTAI_PATCH)) \
 		$(notdir $(RTAI_PATCH))
 endef
 endif
linux/linux.mk +7 -7
@@ -266,8 +266,8 @@
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
 		cp $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
 	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
-		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
+		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
 	fi
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
@@ -284,8 +284,8 @@
 
 define LINUX_INSTALL_HOST_TOOLS
 	# Installing dtc (device tree compiler) as host tool, if selected
-	if grep -q "CONFIG_DTC=y" $(@D)/.config; then 	\
-		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ;	\
+	if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
+		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \
 	fi
 endef
 
@@ -299,10 +299,10 @@
 	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
 		$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
-		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
+		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
 	fi
 	$(LINUX_INSTALL_HOST_TOOLS)
 endef
package/acl/acl.mk +7 -7
@@ -16,15 +16,15 @@
 # While the configuration system uses autoconf, the Makefiles are
 # hand-written and do not use automake. Therefore, we have to hack
 # around their deficiencies by passing installation paths.
-ACL_INSTALL_STAGING_OPTS = 			\
-	prefix=$(STAGING_DIR)/usr 		\
-	exec_prefix=$(STAGING_DIR)/usr 		\
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib	\
+ACL_INSTALL_STAGING_OPTS = \
+	prefix=$(STAGING_DIR)/usr \
+	exec_prefix=$(STAGING_DIR)/usr \
+	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
 	install-dev install-lib
 
-ACL_INSTALL_TARGET_OPTS = 			\
-	prefix=$(TARGET_DIR)/usr 		\
-	exec_prefix=$(TARGET_DIR)/usr 		\
+ACL_INSTALL_TARGET_OPTS = \
+	prefix=$(TARGET_DIR)/usr \
+	exec_prefix=$(TARGET_DIR)/usr \
 	install install-lib
 
 $(eval $(autotools-package))
package/attr/attr.mk +7 -7
@@ -15,15 +15,15 @@
 # While the configuration system uses autoconf, the Makefiles are
 # hand-written and do not use automake. Therefore, we have to hack
 # around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPTS = 			\
-	prefix=$(STAGING_DIR)/usr 		\
-	exec_prefix=$(STAGING_DIR)/usr 		\
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib 	\
+ATTR_INSTALL_STAGING_OPTS = \
+	prefix=$(STAGING_DIR)/usr \
+	exec_prefix=$(STAGING_DIR)/usr \
+	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
 	install-dev install-lib
 
-ATTR_INSTALL_TARGET_OPTS = 			\
-	prefix=$(TARGET_DIR)/usr 		\
-	exec_prefix=$(TARGET_DIR)/usr 		\
+ATTR_INSTALL_TARGET_OPTS = \
+	prefix=$(TARGET_DIR)/usr \
+	exec_prefix=$(TARGET_DIR)/usr \
 	install install-lib
 
 $(eval $(autotools-package))
package/bluez5_utils/bluez5_utils.mk +3 -3
@@ -12,9 +12,9 @@
 BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
 BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
-BLUEZ5_UTILS_CONF_OPTS = 	\
-	--enable-tools 		\
-	--enable-library 	\
+BLUEZ5_UTILS_CONF_OPTS = \
+	--enable-tools \
+	--enable-library \
 	--disable-cups
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
package/bluez_utils/bluez_utils.mk +12 -12
@@ -16,24 +16,24 @@
 
 # BlueZ 3.x compatibility
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--enable-hidd	\
-	--enable-pand	\
-	--enable-sdp	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--enable-hidd \
+	--enable-pand \
+	--enable-sdp \
 	--enable-dund
 endif
 
 # audio support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
-BLUEZ_UTILS_DEPENDENCIES +=	\
-	alsa-lib		\
+BLUEZ_UTILS_DEPENDENCIES += \
+	alsa-lib \
 	libsndfile
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--enable-alsa	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--enable-alsa \
 	--enable-audio
 else
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--disable-alsa	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--disable-alsa \
 	--disable-audio
 endif
 
@@ -47,10 +47,10 @@
 # USB support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
 BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPTS +=	\
+BLUEZ_UTILS_CONF_OPTS += \
 	--enable-usb
 else
-BLUEZ_UTILS_CONF_OPTS +=	\
+BLUEZ_UTILS_CONF_OPTS += \
 	--disable-usb
 endif
 
package/cegui06/cegui06.mk +16 -16
@@ -13,24 +13,24 @@
 CEGUI06_LICENSE_FILES   = COPYING
 CEGUI06_INSTALL_STAGING = YES
 
-CEGUI06_DEPENDENCIES    =       \
-    expat                       \
-    freetype                    \
-    pcre                        \
+CEGUI06_DEPENDENCIES    = \
+    expat \
+    freetype \
+    pcre \
 
-CEGUI06_CONF_OPTS =              \
-    --enable-expat              \
-    --disable-external-tinyxml  \
-    --disable-xerces-c          \
-    --disable-libxml            \
-    --disable-tinyxml           \
-    --disable-opengl-renderer   \
-    --disable-external-glew     \
+CEGUI06_CONF_OPTS = \
+    --enable-expat \
+    --disable-external-tinyxml \
+    --disable-xerces-c \
+    --disable-libxml \
+    --disable-tinyxml \
+    --disable-opengl-renderer \
+    --disable-external-glew \
     --disable-irrlicht-renderer \
     --disable-directfb-renderer \
-    --disable-samples           \
-    --disable-lua-module        \
-    --disable-toluacegui        \
-    --disable-external-toluapp  \
+    --disable-samples \
+    --disable-lua-module \
+    --disable-toluacegui \
+    --disable-external-toluapp \
 
 $(eval $(autotools-package))
package/celt051/celt051.mk +7 -7
@@ -18,13 +18,13 @@
 # if target is the same kind as host (ie. same arch, same bitness,
 # same endianness, so that /usr/lib contains libraries linkable by
 # our cross-compiler)
-CELT051_CONF_OPTS =                  \
-  --enable-fixed-point              \
-  --disable-fixed-point-debug       \
+CELT051_CONF_OPTS = \
+  --enable-fixed-point \
+  --disable-fixed-point-debug \
   --disable-experimental-postfilter \
-  --disable-static-modes            \
-  --disable-assertions              \
-  --disable-oggtest                 \
-  --with-ogg=$(STAGING_DIR)/usr     \
+  --disable-static-modes \
+  --disable-assertions \
+  --disable-oggtest \
+  --with-ogg=$(STAGING_DIR)/usr \
 
 $(eval $(autotools-package))
package/connman/connman.mk +5 -5
@@ -12,12 +12,12 @@
 CONNMAN_LICENSE = GPLv2
 CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CONF_OPTS += --localstatedir=/var \
-	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)		\
-	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet)	\
-	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi)			\
+	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
+	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
+	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
 	$(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
-	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth)	\
-	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback)	\
+	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
+	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
 	$(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
 	$(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
 	$(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
package/directfb/directfb.mk +1 -1
@@ -67,7 +67,7 @@
 	$(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \
 	$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
 	$(if $(BR2_PACKAGE_DIRECTFB_UNICHROME),unichrome) \
-	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830)	\
+	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
 	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
package/dtc/dtc.mk +2 -2
@@ -34,8 +34,8 @@
 endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
 
 define DTC_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS)    \
-	CFLAGS="$(TARGET_CFLAGS)"   \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
 	$(MAKE) -C $(@D) PREFIX=/usr $(DTC_BUILD_GOAL)
 endef
 
package/duma/duma.mk +2 -2
@@ -18,9 +18,9 @@
 # The dependency of some source files in duma_config.h, which is generated at
 # build time, is not specified in the Makefile. Force non-parallel build.
 define DUMA_BUILD_CMDS
-	$(MAKE1) $(TARGET_CONFIGURE_OPTS)       \
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
 		OS=linux \
-		DUMA_OPTIONS="$(DUMA_OPTIONS)"   \
+		DUMA_OPTIONS="$(DUMA_OPTIONS)" \
 		$(DUMA_CPP) -C $(@D)
 endef
 
package/efl/libecore/libecore.mk +6 -6
@@ -15,12 +15,12 @@
 LIBECORE_DEPENDENCIES = host-pkgconf libeina
 
 HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
-HOST_LIBECORE_CONF_OPTS += 		\
-	--enable-ecore-evas 		\
-	--disable-simple-x11 		\
-	--disable-ecore-directfb 	\
-	--disable-ecore-x 		\
-	--disable-ecore-x-xcb 		\
+HOST_LIBECORE_CONF_OPTS += \
+	--enable-ecore-evas \
+	--disable-simple-x11 \
+	--disable-ecore-directfb \
+	--disable-ecore-x \
+	--disable-ecore-x-xcb \
 	--disable-ecore-imf-xim
 
 # default options
package/enlightenment/enlightenment.mk +12 -12
@@ -9,19 +9,19 @@
 ENLIGHTENMENT_LICENSE = BSD-2c
 ENLIGHTENMENT_LICENSE_FILES = COPYING
 
-ENLIGHTENMENT_DEPENDENCIES = 	\
-	host-pkgconf 		\
-	libecore 		\
-	libeet 			\
-	libeina 		\
-	libevas 		\
+ENLIGHTENMENT_DEPENDENCIES = \
+	host-pkgconf \
+	libecore \
+	libeet \
+	libeina \
+	libevas \
 	libevas-generic-loaders \
-	libedje 		\
-	libefreet 		\
-	libedbus 		\
-	libeio 			\
-	host-libedje 		\
-	host-libeet		\
+	libedje \
+	libefreet \
+	libedbus \
+	libeio \
+	host-libedje \
+	host-libeet \
 	xcb-util-keysyms
 
 ENLIGHTENMENT_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
package/eudev/eudev.mk +8 -8
@@ -14,14 +14,14 @@
 # mq_getattr is in librt
 EUDEV_CONF_ENV += LIBS=-lrt
 
-EUDEV_CONF_OPTS =		\
-	--disable-manpages	\
-	--sbindir=/sbin		\
-	--with-rootlibdir=/lib	\
-	--libexecdir=/lib	\
-	--with-firmware-path=/lib/firmware	\
-	--disable-introspection			\
-	--enable-split-usr			\
+EUDEV_CONF_OPTS = \
+	--disable-manpages \
+	--sbindir=/sbin \
+	--with-rootlibdir=/lib \
+	--libexecdir=/lib \
+	--with-firmware-path=/lib/firmware \
+	--disable-introspection \
+	--enable-split-usr \
 	--enable-libkmod
 
 EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
package/ffmpeg/ffmpeg.mk +2 -2
@@ -17,7 +17,7 @@
 endif
 
 FFMPEG_CONF_OPTS = \
-	--prefix=/usr		\
+	--prefix=/usr \
 	--enable-avfilter \
 	--disable-version3 \
 	--enable-logging \
@@ -326,7 +326,7 @@
 	$(TARGET_CONFIGURE_ARGS) \
 	$(FFMPEG_CONF_ENV) \
 	./configure \
-		--enable-cross-compile	\
+		--enable-cross-compile \
 		--cross-prefix=$(TARGET_CROSS) \
 		--sysroot=$(STAGING_DIR) \
 		--host-cc="$(HOSTCC)" \
package/glibc/glibc.mk +2 -2
@@ -102,8 +102,8 @@
 #
 
 GLIBC_LIBS_LIB = \
-	ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.*        \
-	libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.*   \
+	ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \
+	libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \
 	libnss_files.so.* libnss_dns.so.*
 
 ifeq ($(BR2_PACKAGE_GDB),y)
package/gvfs/gvfs.mk +8 -8
@@ -18,12 +18,12 @@
 GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 
 GVFS_CONF_OPTS = \
-	--disable-gconf			\
-	--disable-cdda			\
-	--disable-obexftp		\
-	--disable-gphoto2		\
-	--disable-keyring		\
-	--disable-bash-completion	\
+	--disable-gconf \
+	--disable-cdda \
+	--disable-obexftp \
+	--disable-gphoto2 \
+	--disable-keyring \
+	--disable-bash-completion \
 	--disable-hal
 
 ifeq ($(BR2_PACKAGE_AVAHI),y)
@@ -82,8 +82,8 @@
 endef
 
 GVFS_POST_INSTALL_TARGET_HOOKS += \
-	GVFS_REMOVE_USELESS_BINARY	\
-	GVFS_REMOVE_TARGET_SCHEMAS	\
+	GVFS_REMOVE_USELESS_BINARY \
+	GVFS_REMOVE_TARGET_SCHEMAS \
 	GVFS_COMPILE_SCHEMAS
 
 $(eval $(autotools-package))
package/jack2/jack2.mk +3 -3
@@ -12,10 +12,10 @@
 
 define JACK2_CONFIGURE_CMDS
 	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS)	\
+		$(TARGET_CONFIGURE_OPTS) \
 		$(HOST_DIR)/usr/bin/python2 ./waf configure \
-		--prefix=/usr			\
-		--alsa				\
+		--prefix=/usr \
+		--alsa \
 	)
 endef
 
package/keyutils/keyutils.mk +5 -5
@@ -11,11 +11,11 @@
 KEYUTILS_LICENSE_FILES   = LICENCE.GPL LICENCE.LGPL
 KEYUTILS_INSTALL_STAGING = YES
 
-KEYUTILS_MAKE_ENV =     \
-    INSTALL=$(INSTALL)  \
-    LIBDIR=/usr/lib     \
-    USRLIBDIR=/usr/lib  \
-    LN=$(HOSTLN)        \
+KEYUTILS_MAKE_ENV = \
+    INSTALL=$(INSTALL) \
+    LIBDIR=/usr/lib \
+    USRLIBDIR=/usr/lib \
+    LN=$(HOSTLN) \
 
 define KEYUTILS_BUILD_CMDS
 	$(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
package/lesstif/lesstif.mk +1 -1
@@ -17,7 +17,7 @@
 	--with-gnu-ld \
 	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
 	--enable-debug=no \
-	--enable-production=yes	\
+	--enable-production=yes \
 	--enable-build-tests=no \
 	--no-recursion
 
package/libungif/libungif.mk +3 -3
@@ -13,9 +13,9 @@
 LIBUNGIF_LICENSE_FILES = COPYING
 
 LIBUNGIF_BINS = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
-		gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip  \
-		gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat     \
-		gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif   \
+		gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
+		gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
+		gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
 		text2gif
 
 define LIBUNGIF_BINS_CLEANUP
package/linux-firmware/linux-firmware.mk +31 -31
@@ -37,17 +37,17 @@
 # rtl81xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX),y)
 LINUX_FIRMWARE_FILES += \
-	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin 		\
-	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin	\
-	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin		\
-	rtlwifi/rtl8188efw.bin rtlwifi/rtl8192cufw_A.bin	\
+	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
+	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
+	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
+	rtlwifi/rtl8188efw.bin rtlwifi/rtl8192cufw_A.bin \
 	rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
 
 # rtl87xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX),y)
-LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin	\
+LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
 	rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
@@ -107,19 +107,19 @@
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
 # wl1271-nvs.bin is a symlink to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
-	ti-connectivity/wl1271-fw-2.bin				\
-	ti-connectivity/wl1271-fw-ap.bin			\
-	ti-connectivity/wl1271-fw.bin				\
-	ti-connectivity/wl1271-nvs.bin				\
-	ti-connectivity/wl127x-fw-3.bin				\
-	ti-connectivity/wl127x-fw-plt-3.bin			\
-	ti-connectivity/wl127x-nvs.bin				\
-	ti-connectivity/wl127x-fw-4-mr.bin			\
-	ti-connectivity/wl127x-fw-4-plt.bin			\
-	ti-connectivity/wl127x-fw-4-sr.bin			\
-	ti-connectivity/wl127x-fw-5-mr.bin			\
-	ti-connectivity/wl127x-fw-5-plt.bin			\
-	ti-connectivity/wl127x-fw-5-sr.bin			\
+	ti-connectivity/wl1271-fw-2.bin \
+	ti-connectivity/wl1271-fw-ap.bin \
+	ti-connectivity/wl1271-fw.bin \
+	ti-connectivity/wl1271-nvs.bin \
+	ti-connectivity/wl127x-fw-3.bin \
+	ti-connectivity/wl127x-fw-plt-3.bin \
+	ti-connectivity/wl127x-nvs.bin \
+	ti-connectivity/wl127x-fw-4-mr.bin \
+	ti-connectivity/wl127x-fw-4-plt.bin \
+	ti-connectivity/wl127x-fw-4-sr.bin \
+	ti-connectivity/wl127x-fw-5-mr.bin \
+	ti-connectivity/wl127x-fw-5-plt.bin \
+	ti-connectivity/wl127x-fw-5-sr.bin \
 	ti-connectivity/TIInit_7.2.31.bts
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
@@ -127,19 +127,19 @@
 # wl128x
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
 LINUX_FIRMWARE_FILES += \
-	ti-connectivity/wl128x-fw-3.bin				\
-	ti-connectivity/wl128x-fw-ap.bin			\
-	ti-connectivity/wl128x-fw-plt-3.bin			\
-	ti-connectivity/wl128x-fw.bin				\
-	ti-connectivity/wl1271-nvs.bin				\
-	ti-connectivity/wl128x-nvs.bin				\
-	ti-connectivity/wl12xx-nvs.bin				\
-	ti-connectivity/wl128x-fw-4-mr.bin			\
-	ti-connectivity/wl128x-fw-4-plt.bin			\
-	ti-connectivity/wl128x-fw-4-sr.bin			\
-	ti-connectivity/wl128x-fw-5-mr.bin			\
-	ti-connectivity/wl128x-fw-5-plt.bin			\
-	ti-connectivity/wl128x-fw-5-sr.bin			\
+	ti-connectivity/wl128x-fw-3.bin \
+	ti-connectivity/wl128x-fw-ap.bin \
+	ti-connectivity/wl128x-fw-plt-3.bin \
+	ti-connectivity/wl128x-fw.bin \
+	ti-connectivity/wl1271-nvs.bin \
+	ti-connectivity/wl128x-nvs.bin \
+	ti-connectivity/wl12xx-nvs.bin \
+	ti-connectivity/wl128x-fw-4-mr.bin \
+	ti-connectivity/wl128x-fw-4-plt.bin \
+	ti-connectivity/wl128x-fw-4-sr.bin \
+	ti-connectivity/wl128x-fw-5-mr.bin \
+	ti-connectivity/wl128x-fw-5-plt.bin \
+	ti-connectivity/wl128x-fw-5-sr.bin \
 	ti-connectivity/TIInit_7.2.31.bts
 # wl12xx-nvs.bin (above) is a symlink to:
 LINUX_FIRMWARE_FILES += ti-connectivity/wl127x-nvs.bin
package/midori/midori.mk +3 -3
@@ -30,10 +30,10 @@
 define MIDORI_CONFIGURE_CMDS
 	$(MIDORI_WITHOUT_X11)
 	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS)	\
+		$(TARGET_CONFIGURE_OPTS) \
 		$(HOST_DIR)/usr/bin/python2 ./waf configure \
-		--prefix=/usr			\
-		--disable-libnotify		\
+		--prefix=/usr \
+		--disable-libnotify \
        )
 endef
 
package/mplayer/mplayer.mk +3 -3
@@ -35,7 +35,7 @@
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--enable-freetype \
 	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
 MPLAYER_DEPENDENCIES += freetype
@@ -44,7 +44,7 @@
 endif
 
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--enable-dvdread \
 	--disable-dvdread-internal \
 	--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
@@ -52,7 +52,7 @@
 endif
 
 ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--enable-dvdnav \
 	--with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config
 MPLAYER_DEPENDENCIES += libdvdnav
package/ngrep/ngrep.mk +1 -1
@@ -17,7 +17,7 @@
 endif
 NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
 
-NGREP_CONF_OPTS =  \
+NGREP_CONF_OPTS = \
 	--with-pcap-includes=$(STAGING_DIR)/usr/include \
 	--enable-pcre \
 	--with-pcre=$(STAGING_DIR)/usr \
package/opencv/opencv.mk +58 -58
@@ -13,58 +13,58 @@
 # OpenCV component options
 OPENCV_CONF_OPTS += \
 	-DBUILD_WITH_DEBUG_INFO=OFF \
-	-DBUILD_DOCS=OFF            \
-	-DBUILD_EXAMPLES=OFF        \
+	-DBUILD_DOCS=OFF \
+	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \
 	-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF)
 
 # OpenCV build options
 OPENCV_CONF_OPTS += \
-	-DBUILD_WITH_STATIC_CRT=OFF      \
-	-DENABLE_FAST_MATH=ON            \
-	-DENABLE_NOISY_WARNINGS=OFF      \
-	-DENABLE_OMIT_FRAME_POINTER=ON   \
+	-DBUILD_WITH_STATIC_CRT=OFF \
+	-DENABLE_FAST_MATH=ON \
+	-DENABLE_NOISY_WARNINGS=OFF \
+	-DENABLE_OMIT_FRAME_POINTER=ON \
 	-DENABLE_PRECOMPILED_HEADERS=OFF \
-	-DENABLE_PROFILING=OFF           \
+	-DENABLE_PROFILING=OFF \
 	-DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
 
 # OpenCV link options
 OPENCV_CONF_OPTS += \
 	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-	-DCMAKE_SKIP_RPATH=OFF                  \
+	-DCMAKE_SKIP_RPATH=OFF \
 	-DCMAKE_USE_RELATIVE_PATHS=OFF
 
 # OpenCV packaging options:
 OPENCV_CONF_OPTS += \
-	-DBUILD_PACKAGE=OFF           \
+	-DBUILD_PACKAGE=OFF \
 	-DENABLE_SOLUTION_FOLDERS=OFF \
 	-DINSTALL_CREATE_DISTRIB=OFF
 
 # OpenCV module selection
 OPENCV_CONF_OPTS += \
-	-DBUILD_opencv_androidcamera=OFF                                        \
-	-DBUILD_opencv_apps=OFF                                                 \
-	-DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF)   \
-	-DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF)   \
-	-DBUILD_opencv_core=ON                                                  \
-	-DBUILD_opencv_dynamicuda=OFF                                           \
+	-DBUILD_opencv_androidcamera=OFF \
+	-DBUILD_opencv_apps=OFF \
+	-DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
+	-DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
+	-DBUILD_opencv_core=ON \
+	-DBUILD_opencv_dynamicuda=OFF \
 	-DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \
-	-DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF)       \
-	-DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF)           \
-	-DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF)   \
-	-DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF)   \
-	-DBUILD_opencv_java=OFF                                                 \
-	-DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF)     \
-	-DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF)             \
-	-DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF)   \
+	-DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
+	-DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
+	-DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
+	-DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
+	-DBUILD_opencv_java=OFF \
+	-DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
+	-DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
+	-DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
 	-DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \
-	-DBUILD_opencv_ocl=OFF                                                  \
-	-DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF)       \
-	-DBUILD_opencv_python=OFF                                               \
+	-DBUILD_opencv_ocl=OFF \
+	-DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
+	-DBUILD_opencv_python=OFF \
 	-DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \
 	-DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \
-	-DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF)             \
-	-DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF)       \
+	-DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
+	-DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
 	-DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \
 	-DBUILD_opencv_world=OFF
 
@@ -74,17 +74,17 @@
 #   adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
 OPENCV_CONF_OPTS += \
 	-DENABLE_POWERPC=OFF \
-	-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF)     \
-	-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF)   \
-	-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF)   \
-	-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF)  \
+	-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
+	-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
+	-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
+	-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
 	-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
 	-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
 
 # Cuda stuff
 OPENCV_CONF_OPTS += \
 	-DWITH_CUBLAS=OFF \
-	-DWITH_CUDA=OFF   \
+	-DWITH_CUDA=OFF \
 	-DWITH_CUFFT=OFF
 
 # NVidia stuff
@@ -98,7 +98,7 @@
 # Intel stuff
 OPENCV_CONF_OPTS += \
 	-DWITH_INTELPERC=OFF \
-	-DWITH_IPP=OFF       \
+	-DWITH_IPP=OFF \
 	-DWITH_TBB=OFF
 
 # Smartek stuff
@@ -112,53 +112,53 @@
 
 # Non-Linux support (Android options) must remain OFF:
 OPENCV_CONF_OPTS += \
-	-DWITH_ANDROID_CAMERA=OFF          \
+	-DWITH_ANDROID_CAMERA=OFF \
 	-DBUILD_ANDROID_CAMERA_WRAPPER=OFF \
-	-DBUILD_ANDROID_EXAMPLES=OFF	   \
-	-DINSTALL_ANDROID_EXAMPLES=OFF     \
-	-DBUILD_FAT_JAVA_LIB=OFF           \
+	-DBUILD_ANDROID_EXAMPLES=OFF \
+	-DINSTALL_ANDROID_EXAMPLES=OFF \
+	-DBUILD_FAT_JAVA_LIB=OFF \
 	-DBUILD_JAVA_SUPPORT=OFF
 
 # Non-Linux support (Mac OSX options) must remain OFF:
 OPENCV_CONF_OPTS += \
-	-DWITH_AVFOUNDATION=OFF	\
-	-DWITH_CARBON=OFF       \
+	-DWITH_AVFOUNDATION=OFF \
+	-DWITH_CARBON=OFF \
 	-DWITH_QUICKTIME=OFF
 
 # Non-Linux support (Windows options) must remain OFF:
 OPENCV_CONF_OPTS += \
-	-DWITH_VFW=OFF      \
-	-DWITH_WIN32UI=OFF  \
+	-DWITH_VFW=OFF \
+	-DWITH_WIN32UI=OFF \
 	-DWITH_CSTRIPES=OFF \
-	-DWITH_DSHOW=OFF    \
-	-DWITH_MSMF=OFF     \
+	-DWITH_DSHOW=OFF \
+	-DWITH_MSMF=OFF \
 	-DWITH_VIDEOINPUT=OFF
 
 # Software/3rd-party support options.
 OPENCV_CONF_OPTS += \
-	-DBUILD_JASPER=OFF  \
-	-DBUILD_JPEG=OFF    \
+	-DBUILD_JASPER=OFF \
+	-DBUILD_JPEG=OFF \
 	-DBUILD_OPENEXR=OFF \
-	-DBUILD_PNG=OFF	    \
-	-DBUILD_TIFF=OFF    \
-	-DBUILD_ZLIB=OFF    \
+	-DBUILD_PNG=OFF \
+	-DBUILD_TIFF=OFF \
+	-DBUILD_ZLIB=OFF \
 	-DBUILD_NEW_PYTHON_SUPPORT=OFF \
-	-DINSTALL_C_EXAMPLES=OFF       \
-	-DINSTALL_PYTHON_EXAMPLES=OFF  \
+	-DINSTALL_C_EXAMPLES=OFF \
+	-DINSTALL_PYTHON_EXAMPLES=OFF \
 	-DINSTALL_TO_MANGLED_PATHS=OFF
 
 # Disabled features (mostly because they are not available in Buildroot), but
 # - eigen: OpenCV does not use it, not take any benefit from it.
 OPENCV_CONF_OPTS += \
-	-DWITH_1394=OFF    \
-	-DWITH_EIGEN=OFF   \
+	-DWITH_1394=OFF \
+	-DWITH_EIGEN=OFF \
 	-DWITH_IMAGEIO=OFF \
-	-DWITH_OPENCL=OFF  \
+	-DWITH_OPENCL=OFF \
 	-DWITH_OPENEXR=OFF \
-	-DWITH_OPENGL=OFF  \
-	-DWITH_OPENMP=OFF  \
-	-DWITH_OPENNI=OFF  \
-	-DWITH_UNICAP=OFF  \
+	-DWITH_OPENGL=OFF \
+	-DWITH_OPENMP=OFF \
+	-DWITH_OPENNI=OFF \
+	-DWITH_UNICAP=OFF \
 	-DWITH_XINE=OFF
 
 OPENCV_DEPENDENCIES += zlib
package/openocd/openocd.mk +4 -4
@@ -35,11 +35,11 @@
 
 HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
 
-HOST_OPENOCD_CONF_OPTS = 	\
-	--disable-doxygen-html 	\
-	--enable-dummy 		\
+HOST_OPENOCD_CONF_OPTS = \
+	--disable-doxygen-html \
+	--enable-dummy \
 	--enable-ft2232_libftdi \
-	--enable-jlink 		\
+	--enable-jlink \
 	--enable-vsllink
 
 $(eval $(autotools-package))
package/pkg-generic.mk +2 -2
@@ -49,8 +49,8 @@
 
 # Time steps
 define step_time
-	printf "%s:%-5.5s:%-20.20s: %s\n"           \
-	       "$$(date +%s)" "$(1)" "$(2)" "$(3)"  \
+	printf "%s:%-5.5s:%-20.20s: %s\n" \
+	       "$$(date +%s)" "$(1)" "$(2)" "$(3)" \
 	       >>"$(BUILD_DIR)/build-time.log"
 endef
 GLOBAL_INSTRUMENTATION_HOOKS += step_time
package/poco/poco.mk +20 -20
@@ -12,22 +12,22 @@
 POCO_LICENSE_FILES = LICENSE
 POCO_INSTALL_STAGING = YES
 
-POCO_DEPENDENCIES = zlib pcre					\
-	$(if $(BR2_PACKAGE_POCO_XML),expat)			\
-	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl)		\
-	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl)	\
-	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite)		\
+POCO_DEPENDENCIES = zlib pcre \
+	$(if $(BR2_PACKAGE_POCO_XML),expat) \
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
 	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
 
-POCO_OMIT = Data/ODBC PageCompiler					\
-	$(if $(BR2_PACKAGE_POCO_XML),,XML)				\
-	$(if $(BR2_PACKAGE_POCO_UTIL),,Util)				\
-	$(if $(BR2_PACKAGE_POCO_NET),,Net)				\
-	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL)	\
-	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto)			\
-	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip)				\
-	$(if $(BR2_PACKAGE_POCO_DATA),,Data)				\
-	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL)		\
+POCO_OMIT = Data/ODBC PageCompiler \
+	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
+	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
+	$(if $(BR2_PACKAGE_POCO_NET),,Net) \
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
+	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
+	$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
+	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
 	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
 
 ifeq ($(LIBC),uclibc)
@@ -41,12 +41,12 @@
 
 define POCO_CONFIGURE_CMDS
 	(cd $(@D); ./configure \
-		--config=Linux-CrossEnv	\
-		--prefix=/usr		\
-		--omit="$(POCO_OMIT)"	\
-		$(POCO_CONF_OPTS)	\
-		--unbundled		\
-		--no-tests		\
+		--config=Linux-CrossEnv \
+		--prefix=/usr \
+		--omit="$(POCO_OMIT)" \
+		$(POCO_CONF_OPTS) \
+		--unbundled \
+		--no-tests \
 		--no-samples)
 endef
 
package/python/python.mk +26 -26
@@ -16,22 +16,22 @@
 # also installed in $(HOST_DIR), as it is needed when cross-compiling
 # third-party Python modules.
 
-HOST_PYTHON_CONF_OPTS += 	\
-	--enable-static		\
-	--without-cxx-main 	\
-	--disable-sqlite3	\
-	--disable-tk		\
-	--with-expat=system	\
-	--disable-curses	\
-	--disable-codecs-cjk	\
-	--disable-nis		\
-	--enable-unicodedata	\
-	--disable-dbm		\
-	--disable-gdbm		\
-	--disable-bsddb		\
-	--disable-test-modules	\
-	--disable-bz2		\
-	--disable-ssl		\
+HOST_PYTHON_CONF_OPTS += \
+	--enable-static \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-dbm \
+	--disable-gdbm \
+	--disable-bsddb \
+	--disable-test-modules \
+	--disable-bz2 \
+	--disable-ssl \
 	--disable-pyo-build
 
 # Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -125,16 +125,16 @@
 	ac_cv_working_tzset=yes
 
 PYTHON_CONF_OPTS += \
-	--without-cxx-main 	\
-	--without-doc-strings	\
-	--with-system-ffi	\
-	--disable-pydoc		\
-	--disable-test-modules	\
-	--disable-lib2to3	\
-	--disable-gdbm		\
-	--disable-tk		\
-	--disable-nis		\
-	--disable-dbm		\
+	--without-cxx-main \
+	--without-doc-strings \
+	--with-system-ffi \
+	--disable-pydoc \
+	--disable-test-modules \
+	--disable-lib2to3 \
+	--disable-gdbm \
+	--disable-tk \
+	--disable-nis \
+	--disable-dbm \
 	--disable-pyo-build
 
 # This is needed to make sure the Python build process doesn't try to
package/python3/python3.mk +21 -21
@@ -17,18 +17,18 @@
 # installed in $(HOST_DIR), as it is needed when cross-compiling
 # third-party Python modules.
 
-HOST_PYTHON3_CONF_OPTS += 	\
-	--without-ensurepip	\
-	--without-cxx-main 	\
-	--disable-sqlite3	\
-	--disable-tk		\
-	--with-expat=system	\
-	--disable-curses	\
-	--disable-codecs-cjk	\
-	--disable-nis		\
-	--enable-unicodedata	\
-	--disable-test-modules	\
-	--disable-idle3		\
+HOST_PYTHON3_CONF_OPTS += \
+	--without-ensurepip \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-test-modules \
+	--disable-idle3 \
 	--disable-pyo-build
 
 # Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -108,15 +108,15 @@
 	ac_cv_working_tzset=yes
 
 PYTHON3_CONF_OPTS += \
-	--without-ensurepip	\
-	--without-cxx-main 	\
-	--with-system-ffi	\
-	--disable-pydoc		\
-	--disable-test-modules	\
-	--disable-lib2to3	\
-	--disable-tk		\
-	--disable-nis		\
-	--disable-idle3		\
+	--without-ensurepip \
+	--without-cxx-main \
+	--with-system-ffi \
+	--disable-pydoc \
+	--disable-test-modules \
+	--disable-lib2to3 \
+	--disable-tk \
+	--disable-nis \
+	--disable-idle3 \
 	--disable-pyo-build
 
 # This is needed to make sure the Python build process doesn't try to
package/qemu/qemu.mk +8 -8
@@ -63,14 +63,14 @@
 # package, and ./configure chokes on options such as --host or --target.
 # So, provide out own _CONFIGURE_CMDS to override the defaults.
 define HOST_QEMU_CONFIGURE_CMDS
-	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure   \
-		--target-list="$(HOST_QEMU_TARGETS)"    \
-		--prefix="$(HOST_DIR)/usr"              \
-		--interp-prefix=$(STAGING_DIR)          \
-		--cc="$(HOSTCC)"                        \
-		--host-cc="$(HOSTCC)"                   \
-		--extra-cflags="$(HOST_CFLAGS)"         \
-		--extra-ldflags="$(HOST_LDFLAGS)"       \
+	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
+		--target-list="$(HOST_QEMU_TARGETS)" \
+		--prefix="$(HOST_DIR)/usr" \
+		--interp-prefix=$(STAGING_DIR) \
+		--cc="$(HOSTCC)" \
+		--host-cc="$(HOSTCC)" \
+		--extra-cflags="$(HOST_CFLAGS)" \
+		--extra-ldflags="$(HOST_LDFLAGS)" \
 	)
 endef
 
package/rt-tests/rt-tests.mk +6 -6
@@ -15,16 +15,16 @@
 endif
 
 define RT_TESTS_BUILD_CMDS
-	$(MAKE) -C $(@D) 			\
-		CC="$(TARGET_CC)" 		\
-		CFLAGS="$(TARGET_CFLAGS)"	\
+	$(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		prefix=/usr
 endef
 
 define RT_TESTS_INSTALL_TARGET_CMDS
-	$(MAKE) -C $(@D) 				\
-		DESTDIR="$(TARGET_DIR)" 		\
-		prefix=/usr 				\
+	$(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" \
+		prefix=/usr \
 		$(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \
 		install
 endef
package/rtai/rtai.mk +3 -3
@@ -20,9 +20,9 @@
 
 RTAI_CONF_OPTS = \
 	--includedir=/usr/include/rtai \
-	--with-linux-dir=$(LINUX_DIR) 	\
-	--disable-leds		      	\
-	--disable-rtailab		\
+	--with-linux-dir=$(LINUX_DIR) \
+	--disable-leds \
+	--disable-rtailab \
 	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
 
 RTAI_MAKE = $(MAKE1)
package/samba/samba.mk +4 -4
@@ -38,24 +38,24 @@
 	--with-logfilebase=/var/log \
 	--with-configdir=/etc/samba \
 	--with-privatedir=/etc/samba \
-	\
+ \
 	--disable-cups \
 	--enable-shared-libs \
 	--disable-pie \
 	--disable-relro \
 	--disable-dnssd \
-	\
+ \
 	$(if $(BR2_PACKAGE_SAMBA_AVAHI),--enable-avahi,--disable-avahi) \
 	$(if $(BR2_PACKAGE_SAMBA_GAMIN),--enable-fam,--disable-fam) \
 	$(if $(BR2_PACKAGE_SAMBA_SWAT),--enable-swat,--disable-swat) \
-	\
+ \
 	--without-cluster-support \
 	--without-dnsupdate \
 	--with-sys-quotas \
 	--without-ads \
 	--without-ldap \
 	--with-included-iniparser \
-	\
+ \
 	$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),--with-readline=$(STAGING_DIR)) \
 	$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
 	$(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
package/spice/spice.mk +12 -12
@@ -11,21 +11,21 @@
 SPICE_LICENSE_FILES   = COPYING
 SPICE_INSTALL_STAGING = YES
 SPICE_DEPENDENCIES    = \
-    alsa-lib            \
-    celt051             \
-    jpeg                \
-    openssl             \
-    pixman              \
-    python-pyparsing    \
-    spice-protocol      \
+    alsa-lib \
+    celt051 \
+    jpeg \
+    openssl \
+    pixman \
+    python-pyparsing \
+    spice-protocol \
 
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.
-SPICE_CONF_OPTS =            \
-  --disable-opengl          \
-  --disable-smartcard       \
+SPICE_CONF_OPTS = \
+  --disable-opengl \
+  --disable-smartcard \
   --disable-automated-tests \
-  --without-sasl            \
+  --without-sasl \
 
 SPICE_DEPENDENCIES += host-pkgconf
 
@@ -57,7 +57,7 @@
 # it should link against libz and libjpeg. libz is pkg-config-aware, while
 # libjpeg isn't, hence the two-line tweak
 define SPICE_POST_INSTALL_STAGING_FIX_PC
-	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;'    \
+	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
 	       "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
 endef
 SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
package/squashfs/squashfs.mk +8 -8
@@ -53,16 +53,16 @@
 # no libattr/xz in BR
 HOST_SQUASHFS_MAKE_ARGS = \
 	XATTR_SUPPORT=0 \
-	XZ_SUPPORT=1    \
-	GZIP_SUPPORT=1  \
-	LZ4_SUPPORT=1	\
-	LZO_SUPPORT=1	\
+	XZ_SUPPORT=1 \
+	GZIP_SUPPORT=1 \
+	LZ4_SUPPORT=1 \
+	LZO_SUPPORT=1 \
 	LZMA_XZ_SUPPORT=1
 
 define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE)    \
-   CC="$(TARGET_CC)"           \
-   EXTRA_CFLAGS="$(TARGET_CFLAGS)"   \
+ $(TARGET_MAKE_ENV) $(MAKE) \
+   CC="$(TARGET_CC)" \
+   EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
    EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
    $(SQUASHFS_MAKE_ARGS) \
    -C $(@D)/squashfs-tools/
@@ -76,7 +76,7 @@
 define HOST_SQUASHFS_BUILD_CMDS
  $(HOST_MAKE_ENV) $(MAKE) \
    CC="$(HOSTCC)" \
-   EXTRA_CFLAGS="$(HOST_CFLAGS)"   \
+   EXTRA_CFLAGS="$(HOST_CFLAGS)" \
    EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
    $(HOST_SQUASHFS_MAKE_ARGS) \
    -C $(@D)/squashfs-tools/
package/strongswan/strongswan.mk +43 -43
@@ -10,60 +10,60 @@
 STRONGSWAN_LICENSE = GPLv2+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
-STRONGSWAN_CONF_OPTS +=                                                             \
-      --without-lib-prefix                                                         \
-      --enable-pkcs11=yes                                                          \
-      --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no)                        \
-      --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no)                        \
-      --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no)              \
-      --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no)                \
-      --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no)                      \
-      --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no)                \
-      --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no)                    \
-      --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no)                \
-      --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no)            \
-      --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no)            \
-      --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no)  \
-      --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no)    \
-      --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no)                  \
-      --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no)                \
-      --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no)                      \
-      --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no)                  \
+STRONGSWAN_CONF_OPTS += \
+      --without-lib-prefix \
+      --enable-pkcs11=yes \
+      --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
+      --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
+      --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
+      --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
+      --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
+      --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
+      --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
+      --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
+      --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
+      --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
+      --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
+      --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
+      --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
+      --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
+      --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
+      --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
       --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
 
 ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
-STRONGSWAN_CONF_OPTS +=              \
-      --enable-eap-sim              \
-      --enable-eap-sim-file         \
-      --enable-eap-aka              \
-      --enable-eap-aka-3gpp2        \
-      --enable-eap-simaka-sql       \
+STRONGSWAN_CONF_OPTS += \
+      --enable-eap-sim \
+      --enable-eap-sim-file \
+      --enable-eap-aka \
+      --enable-eap-aka-3gpp2 \
+      --enable-eap-simaka-sql \
       --enable-eap-simaka-pseudonym \
-      --enable-eap-simaka-reauth    \
-      --enable-eap-identity         \
-      --enable-eap-md5              \
-      --enable-eap-gtc              \
-      --enable-eap-mschapv2         \
-      --enable-eap-tls              \
-      --enable-eap-ttls             \
-      --enable-eap-peap             \
-      --enable-eap-tnc              \
-      --enable-eap-dynamic          \
+      --enable-eap-simaka-reauth \
+      --enable-eap-identity \
+      --enable-eap-md5 \
+      --enable-eap-gtc \
+      --enable-eap-mschapv2 \
+      --enable-eap-tls \
+      --enable-eap-ttls \
+      --enable-eap-peap \
+      --enable-eap-tnc \
+      --enable-eap-dynamic \
       --enable-eap-radius
 STRONGSWAN_DEPENDENCIES += gmp
 endif
 
-STRONGSWAN_DEPENDENCIES +=                               \
-      $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl)    \
-      $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt)   \
-      $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp)            \
-      $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl)       \
-      $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2)   \
+STRONGSWAN_DEPENDENCIES += \
+      $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
+      $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
+      $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
+      $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
+      $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
       $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
 
 ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
-STRONGSWAN_DEPENDENCIES +=                               \
-      $(if $(BR2_PACKAGE_SQLITE),sqlite)                 \
+STRONGSWAN_DEPENDENCIES += \
+      $(if $(BR2_PACKAGE_SQLITE),sqlite) \
       $(if $(BR2_PACKAGE_MYSQL),mysql)
 endif
 
package/systemd/systemd.mk +6 -6
@@ -85,15 +85,15 @@
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y)
 SYSTEMD_DEPENDENCIES += \
-	xz 		\
+	xz \
 	libgcrypt
-SYSTEMD_CONF_OPTS += 	\
-	--enable-xz 	\
-	--enable-gcrypt	\
+SYSTEMD_CONF_OPTS += \
+	--enable-xz \
+	--enable-gcrypt \
 	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
 else
-SYSTEMD_CONF_OPTS += 	\
-	--disable-xz 	\
+SYSTEMD_CONF_OPTS += \
+	--disable-xz \
 	--disable-gcrypt
 endif
 
package/tvheadend/tvheadend.mk +10 -10
@@ -21,15 +21,15 @@
 TVHEADEND_DEPENDENCIES += dtv-scan-tables
 
 define TVHEADEND_CONFIGURE_CMDS
-	(cd $(@D);				\
-	 $(TARGET_CONFIGURE_OPTS)		\
-	 $(TARGET_CONFIGURE_ARGS)		\
-	 ./configure				\
-	 --prefix=/usr				\
-	 --arch="$(ARCH)"			\
-	 --cpu="$(BR2_GCC_TARGET_CPU)"		\
-	 --python="$(HOST_DIR)/usr/bin/python"	\
-	 --disable-dvbscan			\
+	(cd $(@D); \
+	 $(TARGET_CONFIGURE_OPTS) \
+	 $(TARGET_CONFIGURE_ARGS) \
+	 ./configure \
+	 --prefix=/usr \
+	 --arch="$(ARCH)" \
+	 --cpu="$(BR2_GCC_TARGET_CPU)" \
+	 --python="$(HOST_DIR)/usr/bin/python" \
+	 --disable-dvbscan \
 	)
 endef
 
@@ -47,7 +47,7 @@
 #  - a default DB with a tvheadend admin
 #  - a non-root user to run as
 define TVHEADEND_INSTALL_DB
-	$(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1     \
+	$(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \
 	              $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
 	chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
 endef
package/tz/tz.mk +9 -9
@@ -11,11 +11,11 @@
 TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
 
 define TZ_BUILD_CMDS
-	(cd $(HOST_DIR)/usr/share/zoneinfo/posix/;                 \
-		for i in $$(find . -type f); do                    \
-			mkdir -p $(@D)/output/$$(dirname $$i);         \
+	(cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \
+		for i in $$(find . -type f); do \
+			mkdir -p $(@D)/output/$$(dirname $$i); \
 			$(TZDUMP) -p . -q $${i#./} > $(@D)/output/$$i; \
-		done                                               \
+		done \
 	)
 endef
 
@@ -26,13 +26,13 @@
 			      $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
 	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
-	if [ -n "$(TZ_LOCALTIME)" ]; then                               \
+	if [ -n "$(TZ_LOCALTIME)" ]; then \
 	    if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
 	        printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
-	               "$(TZDATA_LOCALTIME)";                           \
-	        exit 1;                                                 \
-	    fi;                                                         \
-	    cd $(TARGET_DIR)/etc;                                       \
+	               "$(TZDATA_LOCALTIME)"; \
+	        exit 1; \
+	    fi; \
+	    cd $(TARGET_DIR)/etc; \
 	    ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
 	fi
 endef
package/tzdata/tzdata.mk +9 -9
@@ -28,19 +28,19 @@
 define TZDATA_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share
 	cp -a $(HOST_DIR)/usr/share/zoneinfo $(TARGET_DIR)/usr/share/zoneinfo
-	cd $(TARGET_DIR)/usr/share/zoneinfo;    \
-	for zone in posix/*; do                 \
-	    ln -sfn "$${zone}" "$${zone##*/}";  \
+	cd $(TARGET_DIR)/usr/share/zoneinfo; \
+	for zone in posix/*; do \
+	    ln -sfn "$${zone}" "$${zone##*/}"; \
 	done
-	if [ -n "$(TZDATA_LOCALTIME)" ]; then                           \
+	if [ -n "$(TZDATA_LOCALTIME)" ]; then \
 	    if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
 	        printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
-	               "$(TZDATA_LOCALTIME)";                           \
-	        exit 1;                                                 \
-	    fi;                                                         \
-	    cd $(TARGET_DIR)/etc;                                       \
+	               "$(TZDATA_LOCALTIME)"; \
+	        exit 1; \
+	    fi; \
+	    cd $(TARGET_DIR)/etc; \
 	    ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
-	    echo "$(TZDATA_LOCALTIME)" >timezone;                       \
+	    echo "$(TZDATA_LOCALTIME)" >timezone; \
 	fi
 endef
 
package/uboot-tools/uboot-tools.mk +13 -13
@@ -11,16 +11,16 @@
 UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
 
 define UBOOT_TOOLS_BUILD_CMDS
-	$(MAKE) -C $(@D) 			\
-		CROSS_COMPILE="$(TARGET_CROSS)"	\
-		CFLAGS="$(TARGET_CFLAGS)"	\
-		LDFLAGS="$(TARGET_LDFLAGS)"	\
-		CROSS_BUILD_TOOLS=y		\
+	$(MAKE) -C $(@D) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		CROSS_BUILD_TOOLS=y \
 		tools-only
-	$(MAKE) -C $(@D) 			\
-		CROSS_COMPILE="$(TARGET_CROSS)"	\
-		CFLAGS="$(TARGET_CFLAGS)"	\
-		LDFLAGS="$(TARGET_LDFLAGS)"	\
+	$(MAKE) -C $(@D) \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		env no-dot-config-targets=env
 endef
 
@@ -50,10 +50,10 @@
 endef
 
 define HOST_UBOOT_TOOLS_BUILD_CMDS
-	$(MAKE1) -C $(@D) 			\
-		HOSTCC="$(HOSTCC)"		\
-		HOSTCFLAGS="$(HOST_CFLAGS)"	\
-		HOSTLDFLAGS="$(HOST_LDFLAGS)"	\
+	$(MAKE1) -C $(@D) \
+		HOSTCC="$(HOSTCC)" \
+		HOSTCFLAGS="$(HOST_CFLAGS)" \
+		HOSTLDFLAGS="$(HOST_LDFLAGS)" \
 		tools-only
 endef
 
package/udisks/udisks.mk +9 -9
@@ -9,15 +9,15 @@
 UDISKS_LICENSE = GPLv2+
 UDISKS_LICENSE_FILES = COPYING
 
-UDISKS_DEPENDENCIES = 	\
-	sg3_utils	\
-	host-pkgconf	\
-	udev		\
-	dbus		\
-	dbus-glib	\
-	polkit		\
-	parted		\
-	lvm2		\
+UDISKS_DEPENDENCIES = \
+	sg3_utils \
+	host-pkgconf \
+	udev \
+	dbus \
+	dbus-glib \
+	polkit \
+	parted \
+	lvm2 \
 	libatasmart
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
package/usbmount/usbmount.mk +2 -2
@@ -14,9 +14,9 @@
 define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
 
-	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink 	\
+	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
 		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_create_model_symlink
-	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink 	\
+	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
 		$(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
 
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
package/vde2/vde2.mk +6 -6
@@ -25,13 +25,13 @@
 #
 # Note: disabled features can be added with corresponding dependencies
 #       in future commits.
-VDE2_CONF_OPTS = --disable-experimental  \
-                --disable-cryptcab      \
-                --disable-pcap          \
-                --disable-python        \
-                --disable-profile       \
+VDE2_CONF_OPTS = --disable-experimental \
+                --disable-cryptcab \
+                --disable-pcap \
+                --disable-python \
+                --disable-profile \
                 --disable-kernel-switch \
-                --enable-tuntap         \
+                --enable-tuntap \
 
 #?Package does not build in parallel due to improper make rules
 VDE2_MAKE = $(MAKE1)
package/wpa_supplicant/wpa_supplicant.mk +5 -5
@@ -20,10 +20,10 @@
 WPA_SUPPLICANT_CONFIG_SET =
 
 WPA_SUPPLICANT_CONFIG_ENABLE = \
-	CONFIG_ELOOP_EPOLL	\
-	CONFIG_IEEE80211AC	\
-	CONFIG_IEEE80211N	\
-	CONFIG_IEEE80211R	\
+	CONFIG_ELOOP_EPOLL \
+	CONFIG_IEEE80211AC \
+	CONFIG_IEEE80211N \
+	CONFIG_IEEE80211R \
 	CONFIG_INTERNAL_LIBTOMMATH
 
 WPA_SUPPLICANT_CONFIG_DISABLE = \
@@ -77,7 +77,7 @@
 ifeq ($(BR2_PACKAGE_DBUS),y)
 	WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
 	WPA_SUPPLICANT_MAKE_ENV = \
-		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)"	\
+		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +42 -42
@@ -10,48 +10,48 @@
 XSERVER_XORG_SERVER_LICENSE = MIT
 XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_DEPENDENCIES = 	\
-	xutil_util-macros 		\
-	xlib_libXfont 			\
-	xlib_libX11 			\
-	xlib_libXau 			\
-	xlib_libXdmcp 			\
-	xlib_libXext 			\
-	xlib_libXfixes 			\
-	xlib_libXi 			\
-	xlib_libXrender 		\
-	xlib_libXres 			\
-	xlib_libXft 			\
-	xlib_libXcursor 		\
-	xlib_libXinerama 		\
-	xlib_libXrandr 			\
-	xlib_libXdamage 		\
-	xlib_libXxf86vm 		\
-	xlib_libxkbfile 		\
-	xlib_xtrans 			\
-	xdata_xbitmaps 			\
-	xproto_bigreqsproto 		\
-	xproto_compositeproto 		\
-	xproto_damageproto 		\
-	xproto_fixesproto 		\
-	xproto_fontsproto 		\
-	xproto_glproto 			\
-	xproto_inputproto 		\
-	xproto_kbproto 			\
-	xproto_presentproto 		\
-	xproto_randrproto 		\
-	xproto_renderproto 		\
-	xproto_resourceproto 		\
-	xproto_videoproto 		\
-	xproto_xcmiscproto 		\
-	xproto_xextproto 		\
-	xproto_xf86bigfontproto 	\
-	xproto_xf86dgaproto 		\
-	xproto_xf86vidmodeproto 	\
-	xproto_xproto 			\
-	xkeyboard-config		\
-	pixman 				\
-	mcookie 			\
+XSERVER_XORG_SERVER_DEPENDENCIES = \
+	xutil_util-macros \
+	xlib_libXfont \
+	xlib_libX11 \
+	xlib_libXau \
+	xlib_libXdmcp \
+	xlib_libXext \
+	xlib_libXfixes \
+	xlib_libXi \
+	xlib_libXrender \
+	xlib_libXres \
+	xlib_libXft \
+	xlib_libXcursor \
+	xlib_libXinerama \
+	xlib_libXrandr \
+	xlib_libXdamage \
+	xlib_libXxf86vm \
+	xlib_libxkbfile \
+	xlib_xtrans \
+	xdata_xbitmaps \
+	xproto_bigreqsproto \
+	xproto_compositeproto \
+	xproto_damageproto \
+	xproto_fixesproto \
+	xproto_fontsproto \
+	xproto_glproto \
+	xproto_inputproto \
+	xproto_kbproto \
+	xproto_presentproto \
+	xproto_randrproto \
+	xproto_renderproto \
+	xproto_resourceproto \
+	xproto_videoproto \
+	xproto_xcmiscproto \
+	xproto_xextproto \
+	xproto_xf86bigfontproto \
+	xproto_xf86dgaproto \
+	xproto_xf86vidmodeproto \
+	xproto_xproto \
+	xkeyboard-config \
+	pixman \
+	mcookie \
 	host-pkgconf
 
 XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
package/xbmc/xbmc.mk +1 -1
@@ -39,7 +39,7 @@
 	USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
 	TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
 
-XBMC_CONF_OPTS +=  \
+XBMC_CONF_OPTS += \
 	--with-arch=$(BR2_ARCH) \
 	--disable-crystalhd \
 	--disable-debug \
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#39 lore raw

PATCH 1/1 .mk files: remove alignment of assignments

In reply to Thomas De Schampheleire

Thomas, All,

On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:

Quoted 11 lines

The Buildroot coding style does not align assignments nor line continuation characters (\). This patch updates the .mk files to reflect this.

Command used:

    find * -name "*.mk" | xargs sed -i 's/\s\+\(.\?=\)\s\+/ \1 /g'

Manual fixup:
pkg-utils.mk: fix alignment of FROM/TO variables in caseconvert-helper

Casual visual inspection, plus:
git difftool -y -x 'diff -dub' CSET^..CSET

Regards,
Yann E. MORIN.

Quoted 2,900 lines

---
v2: new patch

 boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk          |  10 +-
 boot/grub/grub.mk                                          |   4 +-
 boot/mxs-bootlets/mxs-bootlets.mk                          |   2 +-
 boot/syslinux/syslinux.mk                                  |   4 +-
 boot/uboot/uboot.mk                                        |  42 ++--
 boot/xloader/xloader.mk                                    |   4 +-
 fs/ext2/ext2.mk                                            |   2 +-
 package/atftp/atftp.mk                                     |   2 +-
 package/atk/atk.mk                                         |   2 +-
 package/bcusdk/bcusdk.mk                                   |   2 +-
 package/bind/bind.mk                                       |   2 +-
 package/ccache/ccache.mk                                   |   4 +-
 package/cegui06/cegui06.mk                                 |  14 +-
 package/celt051/celt051.mk                                 |  12 +-
 package/cjson/cjson.mk                                     |  10 +-
 package/copas/copas.mk                                     |   2 +-
 package/coxpcall/coxpcall.mk                               |   2 +-
 package/dhcpdump/dhcpdump.mk                               |   2 +-
 package/dmidecode/dmidecode.mk                             |   2 +-
 package/dropbear/dropbear.mk                               |   2 +-
 package/dtc/dtc.mk                                         |  18 +-
 package/dvbsnoop/dvbsnoop.mk                               |   8 +-
 package/ecryptfs-utils/ecryptfs-utils.mk                   |  14 +-
 package/efl/libedje/libedje.mk                             |   2 +-
 package/eigen/eigen.mk                                     |   2 +-
 package/freescale-imx/freescale-imx.mk                     |   2 +-
 package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk |   4 +-
 package/freescale-imx/imx-lib/imx-lib.mk                   |   2 +-
 package/freescale-imx/imx-vpu/imx-vpu.mk                   |   2 +-
 package/gcc/gcc-final/gcc-final.mk                         |   6 +-
 package/gcc/gcc-initial/gcc-initial.mk                     |   4 +-
 package/gd/gd.mk                                           |  24 +-
 package/gdb/gdb.mk                                         |   2 +-
 package/genimage/genimage.mk                               |  10 +-
 package/genpart/genpart.mk                                 |   8 +-
 package/git/git.mk                                         |  10 +-
 package/grantlee/grantlee.mk                               |   2 +-
 package/heirloom-mailx/heirloom-mailx.mk                   |   4 +-
 package/igh-ethercat/igh-ethercat.mk                       |   6 +-
 package/input-tools/input-tools.mk                         |   4 +-
 package/irda-utils/irda-utils.mk                           |   2 +-
 package/keyutils/keyutils.mk                               |  10 +-
 package/lbase64/lbase64.mk                                 |   2 +-
 package/lftp/lftp.mk                                       |   2 +-
 package/libatasmart/libatasmart.mk                         |   2 +-
 package/libffi/libffi.mk                                   |   2 +-
 package/libmbim/libmbim.mk                                 |   4 +-
 package/libnspr/libnspr.mk                                 |   2 +-
 package/libqmi/libqmi.mk                                   |   4 +-
 package/libreplaygain/libreplaygain.mk                     |   2 +-
 package/libseccomp/libseccomp.mk                           |  16 +-
 package/libsvg-cairo/libsvg-cairo.mk                       |  10 +-
 package/libsvg/libsvg.mk                                   |  10 +-
 package/liburcu/liburcu.mk                                 |   4 +-
 package/linux-fusion/linux-fusion.mk                       |   2 +-
 package/ljlinenoise/ljlinenoise.mk                         |   2 +-
 package/lmbench/lmbench.mk                                 |   2 +-
 package/localedef/localedef.mk                             |   4 +-
 package/lpty/lpty.mk                                       |   2 +-
 package/lrandom/lrandom.mk                                 |   2 +-
 package/lsqlite3/lsqlite3.mk                               |   2 +-
 package/ltp-testsuite/ltp-testsuite.mk                     |   4 +-
 package/lttng-babeltrace/lttng-babeltrace.mk               |   4 +-
 package/lttng-libust/lttng-libust.mk                       |   6 +-
 package/lttng-modules/lttng-modules.mk                     |   4 +-
 package/lttng-tools/lttng-tools.mk                         |   4 +-
 package/lua-coat/lua-coat.mk                               |   2 +-
 package/lua-coatpersistent/lua-coatpersistent.mk           |   2 +-
 package/lua-csnappy/lua-csnappy.mk                         |   2 +-
 package/lua-messagepack/lua-messagepack.mk                 |   2 +-
 package/lua-testmore/lua-testmore.mk                       |   2 +-
 package/luabitop/luabitop.mk                               |   2 +-
 package/luajit/luajit.mk                                   |   4 +-
 package/luajson/luajson.mk                                 |   2 +-
 package/lualogging/lualogging.mk                           |   2 +-
 package/luarocks/luarocks.mk                               |   2 +-
 package/luasec/luasec.mk                                   |   2 +-
 package/luasocket/luasocket.mk                             |   2 +-
 package/luasql-sqlite3/luasql-sqlite3.mk                   |   2 +-
 package/lunit/lunit.mk                                     |   2 +-
 package/lzlib/lzlib.mk                                     |   2 +-
 package/mesa3d/mesa3d.mk                                   |  10 +-
 package/mii-diag/mii-diag.mk                               |   6 +-
 package/mmc-utils/mmc-utils.mk                             |   2 +-
 package/mplayer/mplayer.mk                                 |   4 +-
 package/mtd/mtd.mk                                         |  76 +++++-----
 package/musepack/musepack.mk                               |   2 +-
 package/on2-8170-modules/on2-8170-modules.mk               |   2 +-
 package/open2300/open2300.mk                               |   6 +-
 package/orbit/orbit.mk                                     |   2 +-
 package/perl/perl.mk                                       |   4 +-
 package/php/php.mk                                         |   2 +-
 package/picocom/picocom.mk                                 |   2 +-
 package/pinentry/pinentry.mk                               |   2 +-
 package/pkg-autotools.mk                                   |   6 +-
 package/pkg-cmake.mk                                       |  12 +-
 package/pkg-generic.mk                                     |  56 +++---
 package/pkg-luarocks.mk                                    |  10 +-
 package/pkg-perl.mk                                        |   2 +-
 package/pkg-python.mk                                      |  26 +-
 package/pkg-utils.mk                                       |  22 +-
 package/python-dialog/python-dialog.mk                     |   4 +-
 package/python-ipy/python-ipy.mk                           |   2 +-
 package/python-netifaces/python-netifaces.mk               |   4 +-
 package/python-protobuf/python-protobuf.mk                 |   4 +-
 package/python-pyparsing/python-pyparsing.mk               |  12 +-
 package/python-pyro/python-pyro.mk                         |   4 +-
 package/python-serial/python-serial.mk                     |   4 +-
 package/python-setuptools/python-setuptools.mk             |   4 +-
 package/python/python.mk                                   |  10 +-
 package/python3/python3.mk                                 |   2 +-
 package/qextserialport/qextserialport.mk                   |   4 +-
 package/qjson/qjson.mk                                     |   2 +-
 package/qt/qt.mk                                           |  76 +++++-----
 package/qt5/qt5base/qt5base.mk                             |  50 +++---
 package/qwt/qwt.mk                                         |   2 +-
 package/rings/rings.mk                                     |   2 +-
 package/rpcbind/rpcbind.mk                                 |   4 +-
 package/rtai/rtai.mk                                       |   4 +-
 package/sam-ba/sam-ba.mk                                   |   4 +-
 package/sg3_utils/sg3_utils.mk                             |   2 +-
 package/slirp/slirp.mk                                     |   8 +-
 package/spice-protocol/spice-protocol.mk                   |  10 +-
 package/spice/spice.mk                                     |  12 +-
 package/squid/squid.mk                                     |   4 +-
 package/sysvinit/sysvinit.mk                               |   6 +-
 package/tcllib/tcllib.mk                                   |  12 +-
 package/tftpd/tftpd.mk                                     |   6 +-
 package/tstools/tstools.mk                                 |   4 +-
 package/tvheadend/tvheadend.mk                             |   2 +-
 package/uboot-tools/uboot-tools.mk                         |   4 +-
 package/udisks/udisks.mk                                   |   2 +-
 package/usbredir/usbredir.mk                               |  16 +-
 package/valgrind/valgrind.mk                               |   4 +-
 package/vde2/vde2.mk                                       |  12 +-
 package/vpnc/vpnc.mk                                       |  10 +-
 package/xinetd/xinetd.mk                                   |   6 +-
 toolchain/toolchain-external/toolchain-external.mk         |   6 +-
 138 files changed, 490 insertions(+), 490 deletions(-)
boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +5 -5
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-BOOT_WRAPPER_AARCH64_VERSION        = 4266507a84f8c06452109d38e0350d4759740694
-BOOT_WRAPPER_AARCH64_SITE           = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
-BOOT_WRAPPER_AARCH64_LICENSE        = BSD3c
-BOOT_WRAPPER_AARCH64_LICENSE_FILES  = LICENSE.txt
-BOOT_WRAPPER_AARCH64_DEPENDENCIES   = linux
+BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
+BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
+BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
+BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
+BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
 BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
 
 # The Git repository does not have the generated configure script and
boot/grub/grub.mk +2 -2
@@ -6,8 +6,8 @@
 
 GRUB_VERSION = 0.97
 GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
-GRUB_PATCH  = grub_$(GRUB_VERSION)-67.diff.gz
-GRUB_SITE   = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub
+GRUB_PATCH = grub_$(GRUB_VERSION)-67.diff.gz
+GRUB_SITE = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub
 
 GRUB_LICENSE = GPLv2+
 GRUB_LICENSE_FILES = COPYING
boot/mxs-bootlets/mxs-bootlets.mk +1 -1
@@ -7,7 +7,7 @@
 ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y)
 	MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL))
 	MXS_BOOTLETS_SITE = $(patsubst %/,%,$(dir $(MXS_BOOTLETS_TARBALL)))
-	MXS_BOOTLETS_SOURCE  = $(notdir $(MXS_BOOTLETS_TARBALL))
+	MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL))
 else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y)
 	MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL)
 	MXS_BOOTLETS_SITE_METHOD = git
boot/syslinux/syslinux.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 SYSLINUX_VERSION = 6.02
-SYSLINUX_SOURCE  = syslinux-$(SYSLINUX_VERSION).tar.xz
-SYSLINUX_SITE    = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
+SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
+SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
 
 SYSLINUX_LICENSE = GPLv2+
 SYSLINUX_LICENSE_FILES = COPYING
boot/uboot/uboot.mk +21 -21
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UBOOT_VERSION    = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 
 UBOOT_LICENSE = GPLv2+
@@ -15,45 +15,45 @@
 ifeq ($(UBOOT_VERSION),custom)
 # Handle custom U-Boot tarballs as specified by the configuration
 UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
-UBOOT_SITE    = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
-UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
+UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
+UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
-UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
 UBOOT_SITE_METHOD = git
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
-UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
 UBOOT_SITE_METHOD = hg
 else
 # Handle stable official U-Boot versions
-UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot
-UBOOT_SOURCE  = u-boot-$(UBOOT_VERSION).tar.bz2
+UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
+UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
-UBOOT_BIN          = u-boot
+UBOOT_BIN = u-boot
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
-UBOOT_BIN          = u-boot.kwb
-UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
+UBOOT_BIN = u-boot.kwb
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
-UBOOT_BIN          = u-boot.ais
-UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
+UBOOT_BIN = u-boot.ais
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
-UBOOT_BIN          = u-boot.ldr
+UBOOT_BIN = u-boot.ldr
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
-UBOOT_BIN          = u-boot-nand.bin
+UBOOT_BIN = u-boot-nand.bin
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
-UBOOT_BIN          = u-boot.img
+UBOOT_BIN = u-boot.img
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
-UBOOT_BIN          = u-boot.imx
+UBOOT_BIN = u-boot.imx
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
-UBOOT_BIN          = u-boot.sb
-UBOOT_MAKE_TARGET  = $(UBOOT_BIN)
+UBOOT_BIN = u-boot.sb
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
 UBOOT_DEPENDENCIES += host-elftosb
 else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
-UBOOT_BIN          = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
+UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
 else
-UBOOT_BIN          = u-boot.bin
-UBOOT_BIN_IFT      = $(UBOOT_BIN).ift
+UBOOT_BIN = u-boot.bin
+UBOOT_BIN_IFT = $(UBOOT_BIN).ift
 endif
 
 UBOOT_ARCH=$(KERNEL_ARCH)
boot/xloader/xloader.mk +2 -2
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-XLOADER_VERSION    = 6f3a26101303051e0f91b6213735b68ce804e94e
-XLOADER_SITE       = git://gitorious.org/x-loader/x-loader.git
+XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
+XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
 XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
 
 XLOADER_LICENSE = GPLv2+
fs/ext2/ext2.mk +1 -1
@@ -20,7 +20,7 @@
 
 ROOTFS_EXT2_DEPENDENCIES = host-genext2fs host-e2fsprogs
 
-EXT2_ENV  = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
+EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
 EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
 
 define ROOTFS_EXT2_CMD
package/atftp/atftp.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ATFTP_VERSION  = 0.7.1
+ATFTP_VERSION = 0.7.1
 ATFTP_SITE = http://sourceforge.net/projects/atftp/files
 ATFTP_LICENSE = GPLv2+
 ATFTP_LICENSE_FILES = LICENSE
package/atk/atk.mk +1 -1
@@ -41,7 +41,7 @@
 		jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
 		gl_cv_c_restrict=no ac_cv_prog_F77=no
 
-ATK_CONF_OPTS =  --disable-glibtest --enable-explicit-deps=no \
+ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no \
 		--disable-debug
 
 ATK_DEPENDENCIES = libglib2 host-pkgconf
package/bcusdk/bcusdk.mk +1 -1
@@ -10,7 +10,7 @@
 BCUSDK_LICENSE = GPLv2+
 BCUSDK_LICENSE_FILES = COPYING
 BCUSDK_INSTALL_STAGING = YES
-BCUSDK_CONF_OPTS =  --enable-onlyeibd --enable-ft12 --enable-pei16 \
+BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
 		 --enable-eibnetip --enable-eibnetipserver \
 		 --enable-eibnetiptunnel --without-pth-test \
 		 --with-pth=$(STAGING_DIR)/usr
package/bind/bind.mk +1 -1
@@ -18,7 +18,7 @@
 BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey
 BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone
 BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
-BIND_CONF_ENV =	BUILD_CC="$(TARGET_CC)" \
+BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
 		BUILD_CFLAGS="$(TARGET_CFLAGS)"
 BIND_CONF_OPTS = --localstatedir=/var \
 		--with-randomdev=/dev/urandom \
package/ccache/ccache.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 CCACHE_VERSION = 3.1.8
-CCACHE_SITE    = http://samba.org/ftp/ccache
-CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.xz
+CCACHE_SITE = http://samba.org/ftp/ccache
+CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
 CCACHE_LICENSE = GPLv3+, others
 CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
package/cegui06/cegui06.mk +7 -7
@@ -5,15 +5,15 @@
 ################################################################################
 
 # Do not update the version, we need exactly that one for Spice.
-CEGUI06_VERSION_MAJOR   = 0.6.2
-CEGUI06_VERSION         = $(CEGUI06_VERSION_MAJOR)b
-CEGUI06_SOURCE          = CEGUI-$(CEGUI06_VERSION).tar.gz
-CEGUI06_SITE            = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
-CEGUI06_LICENSE         = MIT
-CEGUI06_LICENSE_FILES   = COPYING
+CEGUI06_VERSION_MAJOR = 0.6.2
+CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
+CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
+CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
+CEGUI06_LICENSE = MIT
+CEGUI06_LICENSE_FILES = COPYING
 CEGUI06_INSTALL_STAGING = YES
 
-CEGUI06_DEPENDENCIES    = \
+CEGUI06_DEPENDENCIES = \
     expat \
     freetype \
     pcre \
package/celt051/celt051.mk +6 -6
@@ -6,13 +6,13 @@
 
 # Although version newer than 0.5.1.3 exists, we're
 # stuck with 0.5.1.3 for use by Spice (coming later)
-CELT051_VERSION         = 0.5.1.3
-CELT051_SOURCE          = celt-$(CELT051_VERSION).tar.gz
-CELT051_SITE            = http://downloads.xiph.org/releases/celt
-CELT051_LICENSE         = BSD-2c
-CELT051_LICENSE_FILES   = COPYING
+CELT051_VERSION = 0.5.1.3
+CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
+CELT051_SITE = http://downloads.xiph.org/releases/celt
+CELT051_LICENSE = BSD-2c
+CELT051_LICENSE_FILES = COPYING
 CELT051_INSTALL_STAGING = YES
-CELT051_DEPENDENCIES    = libogg
+CELT051_DEPENDENCIES = libogg
 
 # Need to specify --with-ogg, otherwise /usr/lib may be searched for
 # if target is the same kind as host (ie. same arch, same bitness,
package/cjson/cjson.mk +5 -5
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-CJSON_VERSION         = 58
-CJSON_SITE_METHOD     = svn
-CJSON_SITE            = http://svn.code.sf.net/p/cjson/code
+CJSON_VERSION = 58
+CJSON_SITE_METHOD = svn
+CJSON_SITE = http://svn.code.sf.net/p/cjson/code
 CJSON_INSTALL_STAGING = YES
-CJSON_LICENSE         = MIT
-CJSON_LICENSE_FILES   = LICENSE
+CJSON_LICENSE = MIT
+CJSON_LICENSE_FILES = LICENSE
 
 define CJSON_BUILD_CMDS
 	cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC -lm \
package/copas/copas.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 COPAS_VERSION = 1.2.1-1
-COPAS_SUBDIR  = copas-1_2_1
+COPAS_SUBDIR = copas-1_2_1
 COPAS_LICENSE = MIT
 
 $(eval $(luarocks-package))
package/coxpcall/coxpcall.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 COXPCALL_VERSION = 1.15.0-1
-COXPCALL_SUBDIR  = coxpcall
+COXPCALL_SUBDIR = coxpcall
 COXPCALL_LICENSE = MIT
 
 $(eval $(luarocks-package))
package/dhcpdump/dhcpdump.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 DHCPDUMP_VERSION = 1.8
-DHCPDUMP_SITE  = http://www.mavetju.org/download
+DHCPDUMP_SITE = http://www.mavetju.org/download
 DHCPDUMP_DEPENDENCIES = libpcap
 DHCPDUMP_LICENSE = BSD-2c
 DHCPDUMP_LICENSE_FILES = LICENSE
package/dmidecode/dmidecode.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 DMIDECODE_VERSION = 2.12
-DMIDECODE_SITE    = http://download.savannah.gnu.org/releases/dmidecode
+DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
 DMIDECODE_LICENSE = GPLv2+
 DMIDECODE_LICENSE_FILES = LICENSE
 
package/dropbear/dropbear.mk +1 -1
@@ -8,7 +8,7 @@
 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
-DROPBEAR_MAKE =	$(MAKE) MULTI=1 SCPPROGRESS=1 \
+DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
 		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
 
 DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
package/dtc/dtc.mk +9 -9
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-DTC_VERSION         = v1.4.0
-DTC_SITE            = git://git.jdl.com/software/dtc.git
-DTC_LICENSE         = GPLv2+/BSD-2c
-DTC_LICENSE_FILES   = README.license GPL
+DTC_VERSION = v1.4.0
+DTC_SITE = git://git.jdl.com/software/dtc.git
+DTC_LICENSE = GPLv2+/BSD-2c
+DTC_LICENSE_FILES = README.license GPL
 DTC_INSTALL_STAGING = YES
-DTC_DEPENDENCIES    = host-bison host-flex
+DTC_DEPENDENCIES = host-bison host-flex
 
 define DTC_POST_INSTALL_TARGET_RM_DTDIFF
 	rm -f $(TARGET_DIR)/usr/bin/dtdiff
@@ -17,19 +17,19 @@
 
 ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y)
 
-DTC_LICENSE        += (for the library), GPLv2+ (for the executables)
+DTC_LICENSE += (for the library), GPLv2+ (for the executables)
 # Use default goal to build everything
 DTC_BUILD_GOAL      =
-DTC_INSTALL_GOAL    = install
+DTC_INSTALL_GOAL = install
 ifeq ($(BR2_PACKAGE_BASH),)
 DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
 endif
 
 else # $(BR2_PACKAGE_DTC_PROGRAMS) != y
 
-DTC_BUILD_GOAL      = libfdt
+DTC_BUILD_GOAL = libfdt
 #?libfdt_install is our own install rule added by our patch
-DTC_INSTALL_GOAL    = libfdt_install
+DTC_INSTALL_GOAL = libfdt_install
 
 endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
 
package/dvbsnoop/dvbsnoop.mk +4 -4
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DVBSNOOP_VERSION        = 1.4.50
-DVBSNOOP_SITE           = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
-DVBSNOOP_LICENSE        = GPLv2
-DVBSNOOP_LICENSE_FILES  = COPYING
+DVBSNOOP_VERSION = 1.4.50
+DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
+DVBSNOOP_LICENSE = GPLv2
+DVBSNOOP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
package/ecryptfs-utils/ecryptfs-utils.mk +7 -7
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-ECRYPTFS_UTILS_VERSION         = 104
-ECRYPTFS_UTILS_SOURCE          = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
-ECRYPTFS_UTILS_SITE            = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
-ECRYPTFS_UTILS_LICENSE         = GPLv2+
-ECRYPTFS_UTILS_LICENSE_FILES   = COPYING
+ECRYPTFS_UTILS_VERSION = 104
+ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
+ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
+ECRYPTFS_UTILS_LICENSE = GPLv2+
+ECRYPTFS_UTILS_LICENSE_FILES = COPYING
 
-ECRYPTFS_UTILS_DEPENDENCIES    = keyutils libnss host-intltool
-ECRYPTFS_UTILS_CONF_OPTS        = --disable-pywrap --disable-pam
+ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
+ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
 
 #Needed for build system to find pk11func.h and libnss3.so
 ECRYPTFS_UTILS_CONF_ENV = \
package/efl/libedje/libedje.mk +1 -1
@@ -6,7 +6,7 @@
 
 LIBEDJE_VERSION = $(EFL_VERSION)
 LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
-LIBEDJE_SITE =  http://download.enlightenment.org/releases
+LIBEDJE_SITE = http://download.enlightenment.org/releases
 LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)
 LIBEDJE_LICENSE_FILES = COPYING
 
package/eigen/eigen.mk +1 -1
@@ -6,7 +6,7 @@
 
 # version 3.2
 EIGEN_VERSION = ffa86ffb5570
-EIGEN_SITE    = https://bitbucket.org/eigen/eigen
+EIGEN_SITE = https://bitbucket.org/eigen/eigen
 EIGEN_SITE_METHOD = hg
 EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
 EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
package/freescale-imx/freescale-imx.mk +1 -1
@@ -5,6 +5,6 @@
 ################################################################################
 
 FREESCALE_IMX_VERSION = 3.10.17-1.0.0
-FREESCALE_IMX_SITE    = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
+FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
 
 include $(sort $(wildcard package/freescale-imx/*/*.mk))
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk +2 -2
@@ -9,8 +9,8 @@
 else
 GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp
 endif
-GPU_VIV_BIN_MX6Q_SITE    = $(FREESCALE_IMX_SITE)
-GPU_VIV_BIN_MX6Q_SOURCE  = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
+GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
+GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
 
 GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
 
package/freescale-imx/imx-lib/imx-lib.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
-IMX_LIB_SITE    = $(FREESCALE_IMX_SITE)
+IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
 IMX_LIB_LICENSE = LGPLv2.1+
 IMX_LIB_LICENSE_FILES = EULA
 
package/freescale-imx/imx-vpu/imx-vpu.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
-IMX_VPU_SITE    = $(FREESCALE_IMX_SITE)
+IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
 IMX_VPU_LICENSE = Freescale License
 IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
 IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
package/gcc/gcc-final/gcc-final.mk +3 -3
@@ -5,8 +5,8 @@
 ################################################################################
 
 GCC_FINAL_VERSION = $(GCC_VERSION)
-GCC_FINAL_SITE    = $(GCC_SITE)
-GCC_FINAL_SOURCE  = $(GCC_SOURCE)
+GCC_FINAL_SITE = $(GCC_SITE)
+GCC_FINAL_SOURCE = $(GCC_SOURCE)
 
 HOST_GCC_FINAL_DEPENDENCIES = \
 	$(HOST_GCC_COMMON_DEPENDENCIES) \
@@ -45,7 +45,7 @@
 GCC_FINAL_CROSS_LANGUAGES-y = c
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_FORTRAN) += fortran
-GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC)    += objc
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC) += objc
 GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
 
 HOST_GCC_FINAL_CONF_OPTS = \
package/gcc/gcc-initial/gcc-initial.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 GCC_INITIAL_VERSION = $(GCC_VERSION)
-GCC_INITIAL_SITE    = $(GCC_SITE)
-GCC_INITIAL_SOURCE  = $(GCC_SOURCE)
+GCC_INITIAL_SITE = $(GCC_SITE)
+GCC_INITIAL_SOURCE = $(GCC_SOURCE)
 
 HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
 
package/gd/gd.mk +12 -12
@@ -47,18 +47,18 @@
 GD_DEPENDENCIES += zlib
 endif
 
-GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE)	+= annotate
-GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD)	+= bdftogd
-GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL)	+= gd2copypal
-GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF)	+= gd2togif
-GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG)	+= gd2topng
-GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF)	+= gdcmpgif
-GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG)	+= gdparttopng
-GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG)	+= gdtopng
-GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2)	+= giftogd2
-GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD)	+= pngtogd
-GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2)	+= pngtogd2
-GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG)	+= webpng
+GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate
+GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng
+GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif
+GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng
+GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng
+GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2
+GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd
+GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2
+GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng
 
 define GD_REMOVE_TOOLS
 	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GD_TOOLS_))
package/gdb/gdb.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
-GDB_SITE    = $(BR2_GNU_MIRROR)/gdb
+GDB_SITE = $(BR2_GNU_MIRROR)/gdb
 
 ifeq ($(BR2_arc),y)
 GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION))
package/genimage/genimage.mk +5 -5
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GENIMAGE_VERSION        = 7
-GENIMAGE_SOURCE         = genimage-$(GENIMAGE_VERSION).tar.xz
-GENIMAGE_SITE           = http://www.pengutronix.de/software/genimage/download
-GENIMAGE_DEPENDENCIES   = host-pkgconf libconfuse
-GENIMAGE_LICENSE        = GPLv2
+GENIMAGE_VERSION = 7
+GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
+GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
+GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
+GENIMAGE_LICENSE = GPLv2
 
 $(eval $(host-autotools-package))
package/genpart/genpart.mk +4 -4
@@ -4,16 +4,16 @@
 #
 ################################################################################
 
-GENPART_VERSION       = 1.0.2
-GENPART_SOURCE        = genpart-$(GENPART_VERSION).tar.bz2
-GENPART_SITE          = http://www.pengutronix.de/software/genpart/download
+GENPART_VERSION = 1.0.2
+GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2
+GENPART_SITE = http://www.pengutronix.de/software/genpart/download
 # genpart has no license embedded in its source release.
 # However, their project page mentions:
 #   > This community portal offers an overview about our own OSS
 #   > projects and projects Pengutronix is or was involved with.
 # We can thus assume genpart is under a FLOSS license.
 # So, until the authors have clarified the licensing terms:
-GENPART_LICENSE       = Unknown (clarification has been asked to the authors)
+GENPART_LICENSE = Unknown (clarification has been asked to the authors)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
package/git/git.mk +5 -5
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GIT_VERSION         = 1.8.5.4
-GIT_SITE            = http://git-core.googlecode.com/files
-GIT_LICENSE         = GPLv2 LGPLv2.1+
-GIT_LICENSE_FILES   = COPYING LGPL-2.1
-GIT_DEPENDENCIES    = zlib host-gettext
+GIT_VERSION = 1.8.5.4
+GIT_SITE = http://git-core.googlecode.com/files
+GIT_LICENSE = GPLv2 LGPLv2.1+
+GIT_LICENSE_FILES = COPYING LGPL-2.1
+GIT_DEPENDENCIES = zlib host-gettext
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	GIT_DEPENDENCIES += openssl
package/grantlee/grantlee.mk +1 -1
@@ -7,7 +7,7 @@
 GRANTLEE_VERSION = 0.2.0
 GRANTLEE_SITE = http://downloads.grantlee.org
 GRANTLEE_INSTALL_STAGING = YES
-GRANTLEE_DEPENDENCIES =  qt
+GRANTLEE_DEPENDENCIES = qt
 GRANTLEE_LICENSE = LGPLv2.1+
 GRANTLEE_LICENSE_FILES = COPYING.LIB
 
package/heirloom-mailx/heirloom-mailx.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 HEIRLOOM_MAILX_VERSION = 12.5
-HEIRLOOM_MAILX_SOURCE  = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
-HEIRLOOM_MAILX_SITE    = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx
+HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
+HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx
 HEIRLOOM_MAILX_LICENSE = BSD-4c, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
 HEIRLOOM_MAILX_LICENSE_FILES = COPYING
 
package/igh-ethercat/igh-ethercat.mk +3 -3
@@ -5,12 +5,12 @@
 ################################################################################
 
 IGH_ETHERCAT_VERSION = 1.5.2
-IGH_ETHERCAT_SITE    = http://etherlab.org/download/ethercat
-IGH_ETHERCAT_SOURCE  = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
+IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
+IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
 IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries)
 IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
 
-IGH_ETHERCAT_DEPENDENCIES    = linux
+IGH_ETHERCAT_DEPENDENCIES = linux
 IGH_ETHERCAT_INSTALL_STAGING = YES
 
 IGH_ETHERCAT_CONF_OPTS = \
package/input-tools/input-tools.mk +2 -2
@@ -12,8 +12,8 @@
 INPUT_TOOLS_LICENSE_FILES = utils/Makefile
 
 INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL)       += jscal
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST)      += jstest
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
 
 define INPUT_TOOLS_DEBIAN_PATCHES
 	if [ -d $(@D)/debian/patches ]; then \
package/irda-utils/irda-utils.mk +1 -1
@@ -27,7 +27,7 @@
 IRDA_UTILS_SBINS-y =
 IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRATTACH) += irattach
 IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRDAPING) += irdaping
-IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD)   += irnetd
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
 IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y)
 
 define IRDA_UTILS_INSTALL_TARGET_CMDS
package/keyutils/keyutils.mk +5 -5
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-KEYUTILS_VERSION         = 1.5.5
-KEYUTILS_SOURCE          = keyutils-$(KEYUTILS_VERSION).tar.bz2
-KEYUTILS_SITE            = http://people.redhat.com/~dhowells/keyutils
-KEYUTILS_LICENSE         = GPLv2+ LGPLv2.1+
-KEYUTILS_LICENSE_FILES   = LICENCE.GPL LICENCE.LGPL
+KEYUTILS_VERSION = 1.5.5
+KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
+KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
+KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
+KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
 KEYUTILS_INSTALL_STAGING = YES
 
 KEYUTILS_MAKE_ENV = \
package/lbase64/lbase64.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LBASE64_VERSION = 20120820-1
-LBASE64_SUBDIR  = base64
+LBASE64_SUBDIR = base64
 LBASE64_LICENSE = Public domain
 LBASE64_LICENSE_FILES = $(LBASE64_SUBDIR)/README
 
package/lftp/lftp.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LFTP_VERSION = 4.5.5
-LFTP_SITE    = http://lftp.yar.ru/ftp
+LFTP_SITE = http://lftp.yar.ru/ftp
 LFTP_LICENSE = GPLv3+
 LFTP_LICENSE_FILES = COPYING
 LFTP_AUTORECONF = YES
package/libatasmart/libatasmart.mk +1 -1
@@ -6,7 +6,7 @@
 
 LIBATASMART_VERSION = 0.19
 LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
-LIBATASMART_SITE    = http://0pointer.de/public
+LIBATASMART_SITE = http://0pointer.de/public
 LIBATASMART_LICENSE = LGPLv2.1
 LIBATASMART_LICENSE_FILES = LGPL
 LIBATASMART_INSTALL_STAGING = YES
package/libffi/libffi.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBFFI_VERSION = 3.1
-LIBFFI_SITE    = ftp://sourceware.org/pub/libffi
+LIBFFI_SITE = ftp://sourceware.org/pub/libffi
 LIBFFI_LICENSE = MIT
 LIBFFI_LICENSE_FILES = LICENSE
 LIBFFI_INSTALL_STAGING = YES
package/libmbim/libmbim.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LIBMBIM_VERSION = 1.10.0
-LIBMBIM_SITE    = http://www.freedesktop.org/software/libmbim
-LIBMBIM_SOURCE  = libmbim-$(LIBMBIM_VERSION).tar.xz
+LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
+LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
 LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
 LIBMBIM_LICENSE_FILES = COPYING
 LIBMBIM_INSTALL_STAGING = YES
package/libnspr/libnspr.mk +1 -1
@@ -17,7 +17,7 @@
 LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
 		   HOST_LDFLAGS="-lc"
 # NSPR mixes up --build and --host
-LIBNSPR_CONF_OPTS  = --host=$(GNU_HOST_NAME)
+LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
 LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
 LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
package/libqmi/libqmi.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LIBQMI_VERSION = 1.10.2
-LIBQMI_SITE    = http://www.freedesktop.org/software/libqmi
-LIBQMI_SOURCE  = libqmi-$(LIBQMI_VERSION).tar.xz
+LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
+LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
 LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
 LIBQMI_LICENSE_FILES = COPYING
 LIBQMI_INSTALL_STAGING = YES
package/libreplaygain/libreplaygain.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBREPLAYGAIN_VERSION =  r475
+LIBREPLAYGAIN_VERSION = r475
 LIBREPLAYGAIN_SITE = http://files.musepack.net/source
 LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
 # upstream doesn't ship configure
package/libseccomp/libseccomp.mk +8 -8
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-LIBSECCOMP_VERSION         = 2.1.1
-LIBSECCOMP_SITE            = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
-LIBSECCOMP_LICENSE         = LGPLv2.1
-LIBSECCOMP_LICENSE_FILES   = LICENSE
+LIBSECCOMP_VERSION = 2.1.1
+LIBSECCOMP_SITE = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
+LIBSECCOMP_LICENSE = LGPLv2.1
+LIBSECCOMP_LICENSE_FILES = LICENSE
 LIBSECCOMP_INSTALL_STAGING = YES
 
 # Needed for configure to find our system headers:
-LIBSECCOMP_CONF_ENV            = SYSROOT=$(STAGING_DIR)
-LIBSECCOMP_MAKE_ENV            = $(TARGET_CONFIGURE_OPTS)
-LIBSECCOMP_MAKE_OPTS            = SUBDIRS_BUILD=src
+LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
+LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
+LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
 LIBSECCOMP_INSTALL_STAGING_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
-LIBSECCOMP_INSTALL_TARGET_OPTS  = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
+LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
 
 # Not a real autotools package, but works quite OK nonetheless
 $(eval $(autotools-package))
package/libsvg-cairo/libsvg-cairo.mk +5 -5
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBSVG_CAIRO_VERSION         = 0.1.6
-LIBSVG_CAIRO_SITE            = http://cairographics.org/snapshots
-LIBSVG_CAIRO_DEPENDENCIES    = cairo libsvg
+LIBSVG_CAIRO_VERSION = 0.1.6
+LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
+LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
 LIBSVG_CAIRO_INSTALL_STAGING = YES
-LIBSVG_CAIRO_LICENSE         = LGPLv2.1+
-LIBSVG_CAIRO_LICENSE_FILES   = COPYING
+LIBSVG_CAIRO_LICENSE = LGPLv2.1+
+LIBSVG_CAIRO_LICENSE_FILES = COPYING
 
 LIBSVG_CAIRO_CONF_OPTS = --without-x
 
package/libsvg/libsvg.mk +5 -5
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBSVG_VERSION         = 0.1.4
-LIBSVG_SITE            = http://cairographics.org/snapshots
-LIBSVG_DEPENDENCIES    = host-pkgconf libpng libjpeg
+LIBSVG_VERSION = 0.1.4
+LIBSVG_SITE = http://cairographics.org/snapshots
+LIBSVG_DEPENDENCIES = host-pkgconf libpng libjpeg
 LIBSVG_INSTALL_STAGING = YES
-LIBSVG_LICENSE         = LGPLv2+
-LIBSVG_LICENSE_FILES   = COPYING
+LIBSVG_LICENSE = LGPLv2+
+LIBSVG_LICENSE_FILES = COPYING
 
 # libsvg needs at last a XML parser
 ifeq ($(BR2_PACKAGE_EXPAT),y)
package/liburcu/liburcu.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LIBURCU_VERSION = 0.8.4
-LIBURCU_SITE    = http://lttng.org/files/urcu
-LIBURCU_SOURCE  = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
+LIBURCU_SITE = http://lttng.org/files/urcu
+LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
 LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
 LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
 
package/linux-fusion/linux-fusion.mk +1 -1
@@ -14,7 +14,7 @@
 LINUX_FOR_FUSION=$(LINUX_VERSION_PROBED)
 LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
 
-LINUX_FUSION_MAKE_OPTS =  KERNEL_VERSION=$(LINUX_FOR_FUSION)
+LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
 LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX_DIR)
 LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(LINUX_DIR)
 
package/ljlinenoise/ljlinenoise.mk +1 -1
@@ -6,7 +6,7 @@
 
 LJLINENOISE_VERSION_UPSTREAM = 0.1.1
 LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1
-LJLINENOISE_SUBDIR  = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
+LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
 LJLINENOISE_LICENSE = MIT
 LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT
 
package/lmbench/lmbench.mk +1 -1
@@ -7,7 +7,7 @@
 LMBENCH_VERSION = 3.0-a9
 LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
 LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)
-LMBENCH_LICENSE =  lmbench license (based on GPLv2)
+LMBENCH_LICENSE = lmbench license (based on GPLv2)
 LMBENCH_LICENSE_FILES = COPYING COPYING-2
 
 LMBENCH_CFLAGS = $(TARGET_CFLAGS)
package/localedef/localedef.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LOCALEDEF_VERSION = 2.14.1-r17443-ptx1
-LOCALEDEF_SOURCE  = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
-LOCALEDEF_SITE    = http://www.pengutronix.de/software/ptxdist/temporary-src
+LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
+LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
 
 HOST_LOCALEDEF_CONF_OPTS += \
 	--prefix=/usr \
package/lpty/lpty.mk +1 -1
@@ -6,7 +6,7 @@
 
 LPTY_VERSION_UPSTREAM = 1.0.1
 LPTY_VERSION = $(LPTY_VERSION_UPSTREAM)-1
-LPTY_SUBDIR  = lpty-$(LPTY_VERSION)
+LPTY_SUBDIR = lpty-$(LPTY_VERSION)
 LPTY_LICENSE = MIT
 LPTY_LICENSE_FILES = $(LPTY_SUBDIR)/doc/LICENSE
 
package/lrandom/lrandom.mk +1 -1
@@ -9,7 +9,7 @@
 else
 LRANDOM_VERSION = 20120430.51-1
 endif
-LRANDOM_SUBDIR  = random
+LRANDOM_SUBDIR = random
 LRANDOM_LICENSE = Public domain
 
 $(eval $(luarocks-package))
package/lsqlite3/lsqlite3.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LSQLITE3_VERSION = 0.9.1-2
-LSQLITE3_SUBDIR  = lsqlite3_fsl09t
+LSQLITE3_SUBDIR = lsqlite3_fsl09t
 LSQLITE3_DEPENDENCIES = sqlite
 LSQLITE3_LICENSE = MIT
 
package/ltp-testsuite/ltp-testsuite.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LTP_TESTSUITE_VERSION = 20140115
-LTP_TESTSUITE_SOURCE  = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
-LTP_TESTSUITE_SITE    = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
+LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
+LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
 LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+
 LTP_TESTSUITE_LICENSE_FILES = COPYING
 
package/lttng-babeltrace/lttng-babeltrace.mk +2 -2
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace
+LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
 LTTNG_BABELTRACE_VERSION = 1.2.2
-LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
+LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
 LTTNG_BABELTRACE_LICENSE = MIT; LGPL2.1 for include/babeltrace/list.h; GPLv2+ for test code
 LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
 
package/lttng-libust/lttng-libust.mk +3 -3
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-LTTNG_LIBUST_SITE    = http://lttng.org/files/lttng-ust
+LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
 LTTNG_LIBUST_VERSION = 2.5.0
-LTTNG_LIBUST_SOURCE  = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
+LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
 LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond)
 LTTNG_LIBUST_LICENSE_FILES = COPYING
 
 LTTNG_LIBUST_INSTALL_STAGING = YES
-LTTNG_LIBUST_DEPENDENCIES    = liburcu util-linux
+LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 LTTNG_LIBUST_DEPENDENCIES += python
package/lttng-modules/lttng-modules.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LTTNG_MODULES_VERSION = 2.5.0
-LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules
-LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
+LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
+LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
 LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
 
package/lttng-tools/lttng-tools.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LTTNG_TOOLS_VERSION = 2.5.0
-LTTNG_TOOLS_SITE    = http://lttng.org/files/lttng-tools
-LTTNG_TOOLS_SOURCE  = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
+LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
+LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
 LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/*
 LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
 LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr
package/lua-coat/lua-coat.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUA_COAT_VERSION_UPSTREAM = 0.9.0
 LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1
-LUA_COAT_SUBDIR  = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
+LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
 LUA_COAT_LICENSE = MIT
 LUA_COAT_LICENSE_FILES = $(LUA_COAT_SUBDIR)/COPYRIGHT
 
package/lua-coatpersistent/lua-coatpersistent.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.0
 LUA_COATPERSISTENT_VERSION = $(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
-LUA_COATPERSISTENT_SUBDIR  = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
+LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
 LUA_COATPERSISTENT_LICENSE = MIT
 LUA_COATPERSISTENT_LICENSE_FILES = $(LUA_COATPERSISTENT_SUBDIR)/COPYRIGHT
 
package/lua-csnappy/lua-csnappy.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.1
 LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1
-LUA_CSNAPPY_SUBDIR  = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
+LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
 LUA_CSNAPPY_LICENSE = BSD-3c
 LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT
 
package/lua-messagepack/lua-messagepack.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.1
 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1
-LUA_MESSAGEPACK_SUBDIR  = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
+LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
 LUA_MESSAGEPACK_LICENSE = MIT
 LUA_MESSAGEPACK_LICENSE_FILES = $(LUA_MESSAGEPACK_SUBDIR)/COPYRIGHT
 
package/lua-testmore/lua-testmore.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUA_TESTMORE_VERSION_UPSTREAM = 0.3.1
 LUA_TESTMORE_VERSION = $(LUA_TESTMORE_VERSION_UPSTREAM)-1
-LUA_TESTMORE_SUBDIR  = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
+LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
 LUA_TESTMORE_LICENSE = MIT
 LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT
 
package/luabitop/luabitop.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUABITOP_VERSION_UPSTREAM = 1.0.2
 LUABITOP_VERSION = $(LUABITOP_VERSION_UPSTREAM)-1
-LUABITOP_SUBDIR  = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
+LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
 LUABITOP_LICENSE = MIT
 LUABITOP_LICENSE_FILES = $(LUABITOP_SUBDIR)/README
 
package/luajit/luajit.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 LUAJIT_VERSION = 2.0.3
-LUAJIT_SOURCE  = LuaJIT-$(LUAJIT_VERSION).tar.gz
-LUAJIT_SITE    = http://luajit.org/download
+LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
+LUAJIT_SITE = http://luajit.org/download
 LUAJIT_LICENSE = MIT
 LUAJIT_LICENSE_FILES = COPYRIGHT
 
package/luajson/luajson.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUAJSON_VERSION = 1.3.3-1
-LUAJSON_SUBDIR  = luajson
+LUAJSON_SUBDIR = luajson
 LUAJSON_LICENSE = MIT
 LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE
 
package/lualogging/lualogging.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUALOGGING_VERSION = 1.3.0-1
-LUALOGGING_SUBDIR  = lualogging
+LUALOGGING_SUBDIR = lualogging
 LUALOGGING_LICENSE = MIT
 LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT
 
package/luarocks/luarocks.mk +1 -1
@@ -11,7 +11,7 @@
 
 HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
 
-LUAROCKS_CONFIG_DIR  = $(HOST_DIR)/usr/etc/luarocks
+LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
 LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
 
 HOST_LUAROCKS_CONF_OPTS = \
package/luasec/luasec.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUASEC_VERSION_UPSTREAM = 0.5
 LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-2
-LUASEC_SUBDIR  = luasec
+LUASEC_SUBDIR = luasec
 LUASEC_LICENSE = MIT
 LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE
 LUASEC_DEPENDENCIES = openssl
package/luasocket/luasocket.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUASOCKET_VERSION = 3.0rc1-1
-LUASOCKET_SUBDIR  = luasocket-3.0-rc1
+LUASOCKET_SUBDIR = luasocket-3.0-rc1
 LUASOCKET_LICENSE = MIT
 LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE
 
package/luasql-sqlite3/luasql-sqlite3.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LUASQL_SQLITE3_VERSION = 2.3.0-1
-LUASQL_SQLITE3_SUBDIR  = luasql
+LUASQL_SQLITE3_SUBDIR = luasql
 LUASQL_SQLITE3_LICENSE = MIT
 LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/README
 LUASQL_SQLITE3_DEPENDENCIES = sqlite
package/lunit/lunit.mk +1 -1
@@ -6,7 +6,7 @@
 
 LUNIT_VERSION_UPSTREAM = 0.5
 LUNIT_VERSION = $(LUNIT_VERSION_UPSTREAM)-2
-LUNIT_SUBDIR  = lunit-$(LUNIT_VERSION_UPSTREAM)
+LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM)
 LUNIT_LICENSE = MIT
 LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE
 
package/lzlib/lzlib.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 LZLIB_VERSION = 0.4.work3-1
-LZLIB_SUBDIR  = lzlib-0.4-work3
+LZLIB_SUBDIR = lzlib-0.4-work3
 LZLIB_DEPENDENCIES = zlib
 LZLIB_LICENSE = MIT
 
package/mesa3d/mesa3d.mk +5 -5
@@ -55,13 +55,13 @@
 # Drivers
 
 #Gallium Drivers
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)  += nouveau
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA)     += svga
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST)   += swrast
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
 # DRI Drivers
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915)   += i915
-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965)   += i965
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
 
 ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
package/mii-diag/mii-diag.mk +3 -3
@@ -5,9 +5,9 @@
 ################################################################################
 
 MII_DIAG_VERSION = 2.11
-MII_DIAG_SOURCE  = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
-MII_DIAG_PATCH   = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
-MII_DIAG_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
+MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
+MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
+MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
 MII_DIAG_LICENSE = GPL # No version specified
 MII_DIAG_LICENSE_FILES = mii-diag.c
 
package/mmc-utils/mmc-utils.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 MMC_UTILS_VERSION = 11f2ceabc4ad3f0dd568e0ce68166e4803e0615b
-MMC_UTILS_SITE    = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
+MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
 MMC_UTILS_LICENSE = GPLv2
 
 define MMC_UTILS_BUILD_CMDS
package/mplayer/mplayer.mk +2 -2
@@ -14,9 +14,9 @@
 # mplayer needs pcm+mixer support, but configure fails to check for it
 ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
 MPLAYER_DEPENDENCIES += alsa-lib
-MPLAYER_CONF_OPTS    += --enable-alsa
+MPLAYER_CONF_OPTS += --enable-alsa
 else
-MPLAYER_CONF_OPTS    += --disable-alsa
+MPLAYER_CONF_OPTS += --disable-alsa
 endif
 
 ifeq ($(BR2_ENDIAN),"BIG")
package/mtd/mtd.mk +38 -38
@@ -36,45 +36,45 @@
 MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
 SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
 
-MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK)		+= docfdisk
-MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS)	+= doc_loadbios
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP)		+= flashcp
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE)	+= flash_erase
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK)	+= flash_lock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP)	+= flash_otp_dump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO)	+= flash_otp_info
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK)	+= flash_otp_lock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE)	+= flash_otp_write
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK)	+= flash_unlock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK)	+= ftl_check
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT)	+= ftl_format
-MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP)	+= jffs2dump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2)	+= mkfs.jffs2
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG)	+= mtd_debug
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP)		+= nanddump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST)		+= nandtest
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE)	+= nandwrite
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP)		+= nftldump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT)	+= nftl_format
-MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE)	+= recv_image
-MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP)		+= rfddump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT)	+= rfdformat
-MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE)	+= serve_image
-MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL)		+= sumtool
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image
+MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
 
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO)	+= mtdinfo
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH)	+= ubiattach
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32)	+= ubicrc32
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH)	+= ubidetach
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT)	+= ubiformat
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL)	+= ubimkvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO)	+= ubinfo
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE)	+= ubinize
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME)	+= ubirename
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL)	+= ubirmvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL)	+= ubirsvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK)	+= ubiblock
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock
 
 MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
 MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs
package/musepack/musepack.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MUSEPACK_VERSION =  r475
+MUSEPACK_VERSION = r475
 MUSEPACK_SITE = http://files.musepack.net/source
 MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
 MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
package/on2-8170-modules/on2-8170-modules.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
-ON2_8170_MODULES_SITE    = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
+ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
 
 ON2_8170_MODULES_DEPENDENCIES = linux
 
package/open2300/open2300.mk +3 -3
@@ -17,9 +17,9 @@
 
 ifeq ($(BR2_PACKAGE_MYSQL),y)
 	OPEN2300_DEPENDENCIES += mysql
-	OPEN2300_BINS         += mysql2300 mysqlhistlog2300
-	OPEN2300_CFLAGS       += -I$(STAGING_DIR)/usr/include/mysql
-	OPEN2300_LDFLAGS      += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
+	OPEN2300_BINS += mysql2300 mysqlhistlog2300
+	OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql
+	OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
 endif
 
 define OPEN2300_BUILD_CMDS
package/orbit/orbit.mk +1 -1
@@ -6,7 +6,7 @@
 
 ORBIT_VERSION_UPSTREAM = 2.2.1
 ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1
-ORBIT_SUBDIR  = orbit
+ORBIT_SUBDIR = orbit
 ORBIT_LICENSE = MIT
 ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md
 
package/perl/perl.mk +2 -2
@@ -15,8 +15,8 @@
 PERL_CROSS_VERSION = 0.8.5
 PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).2
 # DO NOT refactor with the github helper (the result is not the same)
-PERL_CROSS_SITE    = http://raw.github.com/arsv/perl-cross/releases
-PERL_CROSS_SOURCE  = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
+PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
 PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
 PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
 
package/php/php.mk +1 -1
@@ -13,7 +13,7 @@
 PHP_DEPENDENCIES = host-pkgconf
 PHP_LICENSE = PHP
 PHP_LICENSE_FILES = LICENSE
-PHP_CONF_OPTS =  --mandir=/usr/share/man \
+PHP_CONF_OPTS = --mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--disable-all \
 		--without-pear \
package/picocom/picocom.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 PICOCOM_VERSION = 1.7
-PICOCOM_SITE    = http://picocom.googlecode.com/files
+PICOCOM_SITE = http://picocom.googlecode.com/files
 PICOCOM_LICENSE = GPLv2+
 PICOCOM_LICENSE_FILES = LICENSE.txt
 
package/pinentry/pinentry.mk +1 -1
@@ -10,7 +10,7 @@
 PINENTRY_LICENSE = GPLv2+
 PINENTRY_LICENSE_FILES = COPYING
 PINENTRY_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-PINENTRY_CONF_OPTS =  --disable-pinentry-gtk # gtk1
+PINENTRY_CONF_OPTS = --disable-pinentry-gtk # gtk1
 PINENTRY_CONF_OPTS += --disable-pinentry-qt  # qt3
 PINENTRY_CONF_OPTS += --without-libcap       # requires PAM
 
package/pkg-autotools.mk +3 -3
@@ -107,9 +107,9 @@
 $(2)_CONF_OPTS			?=
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_OPTS                ?= install
-$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR)  install
+$(2)_INSTALL_OPTS ?= install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR)  install
 
 
 #
package/pkg-cmake.mk +6 -6
@@ -38,15 +38,15 @@
 
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPTS			?=
-$(2)_MAKE			?= $$(MAKE)
+$(2)_MAKE ?= $$(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_HOST_OPTS		?= install
-$(2)_INSTALL_STAGING_OPTS	?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPTS		?= DESTDIR=$$(TARGET_DIR) install
+$(2)_INSTALL_HOST_OPTS ?= install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
 
-$(2)_SRCDIR			= $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR			= $$($(2)_SRCDIR)
+$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR = $$($(2)_SRCDIR)
 
 #
 # Configure step. Only define it if not already defined by the package
package/pkg-generic.mk +28 -28
@@ -140,7 +140,7 @@
 #
 # For BR2_GLOBAL_PATCH_DIR, only generate if it is defined
 $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
-$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS =  $(PKGDIR)
+$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR)
 $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS += $(addsuffix /$(RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))
 $(BUILD_DIR)/%/.stamp_patched:
 	@$(call step_start,patch)
@@ -322,9 +322,9 @@
 # this information has only to be specified once, for both the
 # target and host packages of a given .mk file.
 
-$(2)_TYPE                       =  $(4)
-$(2)_NAME			=  $(1)
-$(2)_RAWNAME			=  $$(patsubst host-%,%,$(1))
+$(2)_TYPE = $(4)
+$(2)_NAME = $(1)
+$(2)_RAWNAME = $$(patsubst host-%,%,$(1))
 
 # Keep the package version that may contain forward slashes in the _DL_VERSION
 # variable, then replace all forward slashes ('/') by underscores ('_') to
@@ -344,9 +344,9 @@
   $(2)_VERSION := $$(subst /,_,$$($(2)_VERSION))
 endif
 
-$(2)_BASE_NAME	=  $(1)-$$($(2)_VERSION)
-$(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
-$(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
+$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
+$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
+$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
 
 ifndef $(2)_SUBDIR
  ifdef $(3)_SUBDIR
@@ -356,8 +356,8 @@
  endif
 endif
 
-$(2)_SRCDIR		       = $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR		       ?= $$($(2)_SRCDIR)
+$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
 
 ifneq ($$($(2)_OVERRIDE_SRCDIR),)
 $(2)_VERSION = custom
@@ -367,7 +367,7 @@
  ifdef $(3)_SOURCE
   $(2)_SOURCE = $$($(3)_SOURCE)
  else
-  $(2)_SOURCE			?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
+  $(2)_SOURCE ?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
  endif
 endif
 
@@ -404,7 +404,7 @@
  endif
 endif
 
-$(2)_LICENSE			?= unknown
+$(2)_LICENSE ?= unknown
 
 ifndef $(2)_LICENSE_FILES
  ifdef $(3)_LICENSE_FILES
@@ -418,12 +418,12 @@
  endif
 endif
 
-$(2)_REDISTRIBUTE		?= YES
+$(2)_REDISTRIBUTE ?= YES
 
 # When a target package is a toolchain dependency set this variable to
 # 'NO' so the 'toolchain' dependency is not added to prevent a circular
 # dependency
-$(2)_ADD_TOOLCHAIN_DEPENDENCY	?= YES
+$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES
 
 ifeq ($(4),host)
 $(2)_DEPENDENCIES ?= $$(filter-out  host-toolchain $(1),\
@@ -438,23 +438,23 @@
 # Eliminate duplicates in dependencies
 $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))
 
-$(2)_INSTALL_STAGING		?= NO
-$(2)_INSTALL_IMAGES		?= NO
-$(2)_INSTALL_TARGET		?= YES
+$(2)_INSTALL_STAGING ?= NO
+$(2)_INSTALL_IMAGES ?= NO
+$(2)_INSTALL_TARGET ?= YES
 
 # define sub-target stamps
-$(2)_TARGET_INSTALL_TARGET =	$$($(2)_DIR)/.stamp_target_installed
-$(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
-$(2)_TARGET_INSTALL_IMAGES =	$$($(2)_DIR)/.stamp_images_installed
-$(2)_TARGET_INSTALL_HOST =      $$($(2)_DIR)/.stamp_host_installed
-$(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
-$(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
-$(2)_TARGET_RSYNC =	        $$($(2)_DIR)/.stamp_rsynced
-$(2)_TARGET_RSYNC_SOURCE =      $$($(2)_DIR)/.stamp_rsync_sourced
-$(2)_TARGET_PATCH =		$$($(2)_DIR)/.stamp_patched
-$(2)_TARGET_EXTRACT =		$$($(2)_DIR)/.stamp_extracted
-$(2)_TARGET_SOURCE =		$$($(2)_DIR)/.stamp_downloaded
-$(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
+$(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed
+$(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed
+$(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed
+$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed
+$(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built
+$(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured
+$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced
+$(2)_TARGET_RSYNC_SOURCE = $$($(2)_DIR)/.stamp_rsync_sourced
+$(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched
+$(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted
+$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded
+$(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
 
 # default extract command
 $(2)_EXTRACT_CMDS ?= \
package/pkg-luarocks.mk +5 -5
@@ -34,14 +34,14 @@
 define inner-luarocks-package
 
 $(2)_BUILD_OPTS		?=
-$(2)_SUBDIR		?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
-$(2)_ROCKSPEC		?= $(1)-$$($(3)_VERSION).rockspec
-$(2)_SOURCE		?= $(1)-$$($(3)_VERSION).src.rock
-$(2)_SITE		?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
+$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
+$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
+$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
+$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
 
 # Since we do not support host-luarocks-package, we know this is
 # a target package, and can just add the required dependencies
-$(2)_DEPENDENCIES	+= host-luarocks luainterpreter
+$(2)_DEPENDENCIES += host-luarocks luainterpreter
 
 #
 # Extract step
package/pkg-perl.mk +1 -1
@@ -19,7 +19,7 @@
 #
 ################################################################################
 
-PERL_ARCHNAME	= $(ARCH)-linux
+PERL_ARCHNAME = $(ARCH)-linux
 
 ################################################################################
 # inner-perl-package -- defines how the configuration, compilation and
package/pkg-python.mk +13 -13
@@ -91,8 +91,8 @@
 
 define inner-python-package
 
-$(2)_SRCDIR	= $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR	= $$($(2)_SRCDIR)
+$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR = $$($(2)_SRCDIR)
 
 $(2)_ENV         ?=
 $(2)_BUILD_OPTS   ?=
@@ -109,28 +109,28 @@
 # Distutils
 ifeq ($$($(2)_SETUP_TYPE),distutils)
 ifeq ($(4),target)
-$(2)_BASE_ENV         = $$(PKG_PYTHON_DISTUTILS_ENV)
-$(2)_BASE_BUILD_TGT   = build
-$(2)_BASE_BUILD_OPTS   = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
-$(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
+$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
+$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
+$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
 else
-$(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
-$(2)_BASE_BUILD_TGT   = build
+$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
+$(2)_BASE_BUILD_TGT = build
 $(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
 endif
 # Setuptools
 else ifeq ($$($(2)_SETUP_TYPE),setuptools)
 ifeq ($(4),target)
-$(2)_BASE_ENV         = $$(PKG_PYTHON_SETUPTOOLS_ENV)
-$(2)_BASE_BUILD_TGT   = build
+$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
+$(2)_BASE_BUILD_TGT = build
 $(2)_BASE_BUILD_OPTS   =
-$(2)_BASE_INSTALL_TARGET_OPTS  = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
+$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
 $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
 else
-$(2)_BASE_ENV         = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
-$(2)_BASE_BUILD_TGT   = build
+$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
+$(2)_BASE_BUILD_TGT = build
 $(2)_BASE_BUILD_OPTS   =
 $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
 endif
package/pkg-utils.mk +11 -11
@@ -52,30 +52,30 @@
 # directory from its makefile directory, using the $(MAKEFILE_LIST)
 # variable provided by make. This is used by the *TARGETS macros to
 # automagically find where the package is located.
-pkgdir       = $(dir $(lastword $(MAKEFILE_LIST)))
-pkgname      = $(lastword $(subst /, ,$(pkgdir)))
+pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
+pkgname = $(lastword $(subst /, ,$(pkgdir)))
 
 # Define extractors for different archive suffixes
-INFLATE.bz2  = $(BZCAT)
-INFLATE.gz   = $(ZCAT)
-INFLATE.tbz  = $(BZCAT)
+INFLATE.bz2 = $(BZCAT)
+INFLATE.gz = $(ZCAT)
+INFLATE.tbz = $(BZCAT)
 INFLATE.tbz2 = $(BZCAT)
-INFLATE.tgz  = $(ZCAT)
-INFLATE.xz   = $(XZCAT)
-INFLATE.tar  = cat
+INFLATE.tgz = $(ZCAT)
+INFLATE.xz = $(XZCAT)
+INFLATE.tar = cat
 # suitable-extractor(filename): returns extractor based on suffix
 suitable-extractor = $(INFLATE$(suffix $(1)))
 
 # MESSAGE Macro -- display a message in bold type
-MESSAGE     = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
-TERM_BOLD  := $(shell tput smso)
+MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+TERM_BOLD := $(shell tput smso)
 TERM_RESET := $(shell tput rmso)
 
 # Utility functions for 'find'
 # findfileclauses(filelist) => -name 'X' -o -name 'Y'
 findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
 # finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY'
-finddirclauses  = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
+finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
 
 # Miscellaneous utility functions
 # notfirstword(wordlist): returns all but the first word in wordlist
package/python-dialog/python-dialog.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 PYTHON_DIALOG_VERSION = 3.0.1
-PYTHON_DIALOG_SOURCE  = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
-PYTHON_DIALOG_SITE    = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
+PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
+PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
 PYTHON_DIALOG_LICENSE = LGPLv2.1+
 PYTHON_DIALOG_LICENSE_FILES = COPYING
 PYTHON_DIALOG_SETUP_TYPE = distutils
package/python-ipy/python-ipy.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 PYTHON_IPY_VERSION = IPy-0.75
-PYTHON_IPY_SITE    = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
+PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
 PYTHON_IPY_LICENSE = BSD-3c
 PYTHON_IPY_LICENSE_FILES = COPYING
 PYTHON_IPY_SETUP_TYPE = distutils
package/python-netifaces/python-netifaces.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 PYTHON_NETIFACES_VERSION = 0.7
-PYTHON_NETIFACES_SOURCE  = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
-PYTHON_NETIFACES_SITE    = http://alastairs-place.net/projects/netifaces
+PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
+PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
 PYTHON_NETIFACES_LICENSE = MIT
 PYTHON_NETIFACES_LICENSE_FILES = README
 PYTHON_NETIFACES_SETUP_TYPE = setuptools
package/python-protobuf/python-protobuf.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
-PYTHON_PROTOBUF_SOURCE  = $(PROTOBUF_SOURCE)
-PYTHON_PROTOBUF_SITE    = $(PROTOBUF_SITE)
+PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
+PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
 PYTHON_PROTOBUF_LICENSE = BSD-3c
 PYTHON_PROTOBUF_LICENSE_FILES = COPYING.txt
 PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf
package/python-pyparsing/python-pyparsing.mk +6 -6
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PYPARSING_VERSION         = 1.5.6
-PYTHON_PYPARSING_SOURCE          = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
-PYTHON_PYPARSING_SITE            = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
-PYTHON_PYPARSING_LICENSE         = MIT
-PYTHON_PYPARSING_LICENSE_FILES   = LICENSE
-PYTHON_PYPARSING_SETUP_TYPE      = distutils
+PYTHON_PYPARSING_VERSION = 1.5.6
+PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
+PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
+PYTHON_PYPARSING_LICENSE = MIT
+PYTHON_PYPARSING_LICENSE_FILES = LICENSE
+PYTHON_PYPARSING_SETUP_TYPE = distutils
 
 $(eval $(python-package))
package/python-pyro/python-pyro.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 PYTHON_PYRO_VERSION = 3.14
-PYTHON_PYRO_SOURCE  = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
-PYTHON_PYRO_SITE    = https://pypi.python.org/packages/source/P/Pyro
+PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
+PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro
 PYTHON_PYRO_LICENSE = MIT
 PYTHON_PYRO_LICENSE_FILES = LICENSE
 PYTHON_PYRO_SETUP_TYPE = distutils
package/python-serial/python-serial.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 PYTHON_SERIAL_VERSION = 2.6
-PYTHON_SERIAL_SOURCE  = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
-PYTHON_SERIAL_SITE    = http://pypi.python.org/packages/source/p/pyserial
+PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
+PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial
 PYTHON_SERIAL_LICENSE = Python Software Foundation License
 PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
 PYTHON_SERIAL_SETUP_TYPE = distutils
package/python-setuptools/python-setuptools.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 PYTHON_SETUPTOOLS_VERSION = 2.1.2
-PYTHON_SETUPTOOLS_SOURCE  = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
-PYTHON_SETUPTOOLS_SITE    = http://pypi.python.org/packages/source/s/setuptools
+PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
+PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools
 PYTHON_SETUPTOOLS_LICENSE = Python Software Foundation or Zope Public License
 PYTHON_SETUPTOOLS_LICENSE_FILES = PKG-INFO
 PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
package/python/python.mk +5 -5
@@ -5,10 +5,10 @@
 ################################################################################
 
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION       = $(PYTHON_VERSION_MAJOR).8
-PYTHON_SOURCE        = Python-$(PYTHON_VERSION).tar.xz
-PYTHON_SITE          = http://python.org/ftp/python/$(PYTHON_VERSION)
-PYTHON_LICENSE       = Python software foundation license v2, others
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
+PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
+PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
+PYTHON_LICENSE = Python software foundation license v2, others
 PYTHON_LICENSE_FILES = LICENSE
 
 # Python needs itself to be built, so in order to cross-compile
@@ -48,7 +48,7 @@
 # MAKE1 has shown to workaround the problem.
 HOST_PYTHON_MAKE = $(MAKE1)
 
-PYTHON_DEPENDENCIES  = host-python libffi
+PYTHON_DEPENDENCIES = host-python libffi
 
 HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
 
package/python3/python3.mk +1 -1
@@ -37,7 +37,7 @@
 HOST_PYTHON3_CONF_ENV += \
 	LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags"
 
-PYTHON3_DEPENDENCIES  = host-python3 libffi
+PYTHON3_DEPENDENCIES = host-python3 libffi
 
 HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib
 
package/qextserialport/qextserialport.mk +2 -2
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-QEXTSERIALPORT_VERSION     = 6c47244de4ce6db43c2f05caee957666c951dae1
-QEXTSERIALPORT_SITE        = https://qextserialport.googlecode.com/git
+QEXTSERIALPORT_VERSION = 6c47244de4ce6db43c2f05caee957666c951dae1
+QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/git
 QEXTSERIALPORT_SITE_METHOD = git
 
 QEXTSERIALPORT_LICENSE = MIT
package/qjson/qjson.mk +1 -1
@@ -8,7 +8,7 @@
 
 QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
 QJSON_INSTALL_STAGING = YES
-QJSON_DEPENDENCIES =  qt
+QJSON_DEPENDENCIES = qt
 QJSON_LICENSE = LGPLv2.1
 QJSON_LICENSE_FILES = COPYING.lib
 
package/qt/qt.mk +38 -38
@@ -13,8 +13,8 @@
 
 QT_VERSION_MAJOR = 4.8
 QT_VERSION = $(QT_VERSION_MAJOR).6
-QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE    = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
+QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
+QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 
@@ -252,7 +252,7 @@
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
 QT_CONFIGURE_OPTS += -system-zlib
-QT_DEPENDENCIES   += zlib
+QT_DEPENDENCIES += zlib
 endif
 endif
 
@@ -261,7 +261,7 @@
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
 QT_CONFIGURE_OPTS += -system-libjpeg
-QT_DEPENDENCIES   += jpeg
+QT_DEPENDENCIES += jpeg
 else
 QT_CONFIGURE_OPTS += -no-libjpeg
 endif
@@ -272,7 +272,7 @@
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
 QT_CONFIGURE_OPTS += -system-libpng
-QT_DEPENDENCIES   += libpng
+QT_DEPENDENCIES += libpng
 else
 QT_CONFIGURE_OPTS += -no-libpng
 endif
@@ -283,7 +283,7 @@
 else
 ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
 QT_CONFIGURE_OPTS += -system-libtiff
-QT_DEPENDENCIES   += tiff
+QT_DEPENDENCIES += tiff
 else
 QT_CONFIGURE_OPTS += -no-libtiff
 endif
@@ -302,29 +302,29 @@
 ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
 QT_CONFIGURE_OPTS += -system-freetype
 QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
-QT_DEPENDENCIES   += freetype
+QT_DEPENDENCIES += freetype
 else
 QT_CONFIGURE_OPTS += -no-freetype
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_DEPENDENCIES   += dbus
+QT_DEPENDENCIES += dbus
 endif
 
 ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
 QT_CONFIGURE_OPTS += -openssl
-QT_DEPENDENCIES   += openssl
+QT_DEPENDENCIES += openssl
 else
 QT_CONFIGURE_OPTS += -no-openssl
 endif
 
 ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
 QT_CONFIGURE_OPTS += -opengl es2 -egl
-QT_DEPENDENCIES   += libgles libegl
-QT_CFLAGS   += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
+QT_DEPENDENCIES += libgles libegl
+QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
 QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
-QT_LDFLAGS  += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
+QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
 else
 QT_CONFIGURE_OPTS += -no-opengl
 endif
@@ -336,22 +336,22 @@
 endif
 ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
 QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT_DEPENDENCIES   += mysql
+QT_DEPENDENCIES += mysql
 endif
 ifeq ($(BR2_PACKAGE_QT_ODBC),y)
 QT_CONFIGURE_OPTS += -qt-sql-odbc
 endif
 ifeq ($(BR2_PACKAGE_QT_PSQL),y)
 QT_CONFIGURE_OPTS += -qt-sql-psql
-QT_CONFIGURE_ENV  += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
-QT_DEPENDENCIES   += postgresql
+QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
+QT_DEPENDENCIES += postgresql
 endif
 ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
 QT_CONFIGURE_OPTS += -qt-sql-sqlite
 else
 ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
 QT_CONFIGURE_OPTS += -system-sqlite
-QT_DEPENDENCIES   += sqlite
+QT_DEPENDENCIES += sqlite
 else
 QT_CONFIGURE_OPTS += -no-sql-sqlite
 endif
@@ -380,14 +380,14 @@
 
 ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
 QT_CONFIGURE_OPTS += -audio-backend
-QT_DEPENDENCIES   += alsa-lib
+QT_DEPENDENCIES += alsa-lib
 else
 QT_CONFIGURE_OPTS += -no-audio-backend
 endif
 
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
 QT_CONFIGURE_OPTS += -phonon
-QT_DEPENDENCIES   += gstreamer gst-plugins-base
+QT_DEPENDENCIES += gstreamer gst-plugins-base
 else
 QT_CONFIGURE_OPTS += -no-phonon
 endif
@@ -532,60 +532,60 @@
 
 # Build the list of libraries and plugins to install to the target
 
-QT_INSTALL_LIBS    += QtCore
-QT_HOST_PROGRAMS   += moc rcc qmake lrelease
+QT_INSTALL_LIBS += QtCore
+QT_HOST_PROGRAMS += moc rcc qmake lrelease
 
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_INSTALL_LIBS    += QtGui
-QT_HOST_PROGRAMS   += uic
+QT_INSTALL_LIBS += QtGui
+QT_HOST_PROGRAMS += uic
 endif
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-QT_INSTALL_LIBS    += QtSql
+QT_INSTALL_LIBS += QtSql
 endif
 ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_INSTALL_LIBS    += QtMultimedia
+QT_INSTALL_LIBS += QtMultimedia
 endif
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_INSTALL_LIBS    += phonon
+QT_INSTALL_LIBS += phonon
 endif
 ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_INSTALL_LIBS    += QtSvg
+QT_INSTALL_LIBS += QtSvg
 endif
 ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-QT_INSTALL_LIBS    += QtNetwork
+QT_INSTALL_LIBS += QtNetwork
 endif
 ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_INSTALL_LIBS    += QtWebKit
+QT_INSTALL_LIBS += QtWebKit
 endif
 ifeq ($(BR2_PACKAGE_QT_XML),y)
-QT_INSTALL_LIBS    += QtXml
+QT_INSTALL_LIBS += QtXml
 endif
 ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_INSTALL_LIBS    += QtDBus
+QT_INSTALL_LIBS += QtDBus
 endif
 ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_INSTALL_LIBS    += QtXmlPatterns
+QT_INSTALL_LIBS += QtXmlPatterns
 endif
 ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_INSTALL_LIBS    += QtScript
+QT_INSTALL_LIBS += QtScript
 endif
 ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_INSTALL_LIBS    += QtScriptTools
+QT_INSTALL_LIBS += QtScriptTools
 endif
 ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
-QT_INSTALL_LIBS    += QtDeclarative
+QT_INSTALL_LIBS += QtDeclarative
 endif
 ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_INSTALL_LIBS    += Qt3Support
+QT_INSTALL_LIBS += Qt3Support
 endif
 ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-QT_INSTALL_LIBS    += QtOpenGL
+QT_INSTALL_LIBS += QtOpenGL
 endif
 ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-QT_INSTALL_LIBS    += pvrQWSWSEGL
+QT_INSTALL_LIBS += pvrQWSWSEGL
 endif
 ifeq ($(BR2_PACKAGE_QT_TEST),y)
-QT_INSTALL_LIBS    += QtTest
+QT_INSTALL_LIBS += QtTest
 endif
 
 QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
package/qt5/qt5base/qt5base.mk +25 -25
@@ -61,22 +61,22 @@
 ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
 ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
 QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT5BASE_DEPENDENCIES   += mysql
+QT5BASE_DEPENDENCIES += mysql
 else
 QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y)
 QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql
-QT5BASE_CONFIGURE_ENV  += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
-QT5BASE_DEPENDENCIES   += postgresql
+QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
+QT5BASE_DEPENDENCIES += postgresql
 else
 QT5BASE_CONFIGURE_OPTS += -no-sql-psql
 endif
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
 endif
 
@@ -86,11 +86,11 @@
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
 QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
-QT5BASE_DEPENDENCIES   += \
+QT5BASE_DEPENDENCIES += \
 	libxcb \
 	xcb-util-wm \
 	xcb-util-image \
@@ -98,7 +98,7 @@
 	xlib_libX11 \
 	libxkbcommon
 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
-QT5BASE_DEPENDENCIES   += xlib_libXext
+QT5BASE_DEPENDENCIES += xlib_libXext
 endif
 else
 QT5BASE_CONFIGURE_OPTS += -no-xcb
@@ -106,10 +106,10 @@
 
 ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),y)
 QT5BASE_CONFIGURE_OPTS += -opengl desktop
-QT5BASE_DEPENDENCIES   += libgl
+QT5BASE_DEPENDENCIES += libgl
 else ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_ES2),y)
 QT5BASE_CONFIGURE_OPTS += -opengl es2
-QT5BASE_DEPENDENCIES   += libgles
+QT5BASE_DEPENDENCIES += libgles
 else
 QT5BASE_CONFIGURE_OPTS += -no-opengl
 endif
@@ -119,7 +119,7 @@
 
 ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
 QT5BASE_CONFIGURE_OPTS += -eglfs
-QT5BASE_DEPENDENCIES   += libegl
+QT5BASE_DEPENDENCIES += libegl
 ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
 QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
 	$(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
@@ -133,41 +133,41 @@
 endif
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_OPENSSL),openssl)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),-tslib,-no-tslib)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu)
-QT5BASE_DEPENDENCIES   += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
 
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
 
 # Build the list of libraries to be installed on the target
-QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK)    += Qt5Network
+QT5BASE_INSTALL_LIBS_y += Qt5Core
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL)        += Qt5Sql
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST)       += Qt5Test
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML)        += Qt5Xml
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
 
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI)          += Qt5Gui
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS)      += Qt5Widgets
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
 
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
package/qwt/qwt.mk +1 -1
@@ -10,7 +10,7 @@
 QWT_INSTALL_STAGING = YES
 QWT_DEPENDENCIES = qt
 
-QWT_CONFIG  =    's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
+QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
 QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
 QWT_CONFIG += -e 's%/features%/mkspecs/features%'
 
package/rings/rings.mk +1 -1
@@ -6,7 +6,7 @@
 
 RINGS_VERSION_MAJOR = 1.3.0
 RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
-RINGS_SUBDIR  = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
+RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
 RINGS_LICENSE = MIT
 
 $(eval $(luarocks-package))
package/rpcbind/rpcbind.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 RPCBIND_VERSION = 0.2.1
-RPCBIND_SITE    = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
-RPCBIND_SOURCE  = rpcbind-$(RPCBIND_VERSION).tar.bz2
+RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
+RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_LICENSE = BSD-3c
 RPCBIND_LICENSE_FILES = COPYING
 RPCBIND_AUTORECONF = YES
package/rtai/rtai.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 RTAI_VERSION = 3.8.1
-RTAI_SOURCE  = rtai-$(RTAI_VERSION).tar.bz2
-RTAI_SITE    = https://www.rtai.org/userfiles/downloads/RTAI
+RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
+RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
 RTAI_INSTALL_STAGING = YES
 
 # The <pkg>_CONFIG_SCRIPTS cannot apply here to the specificities of rtai-config
package/sam-ba/sam-ba.mk +2 -2
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SAM_BA_SITE    = http://www.atmel.com/dyn/resources/prod_documents
+SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
 SAM_BA_VERSION = 2.12
-SAM_BA_SOURCE  = sam-ba_$(SAM_BA_VERSION).zip
+SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION).zip
 SAM_BA_PATCH = sam-ba_$(SAM_BA_VERSION)_patch5.gz
 SAM_BA_LICENSE = BSD-like (partly binary-only)
 SAM_BA_LICENSE_FILES = doc/readme.txt
package/sg3_utils/sg3_utils.mk +1 -1
@@ -6,7 +6,7 @@
 
 SG3_UTILS_VERSION = 1.39
 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
-SG3_UTILS_SITE  = http://sg.danny.cz/sg/p
+SG3_UTILS_SITE = http://sg.danny.cz/sg/p
 SG3_UTILS_LICENSE = BSD-3c
 # utils progs are GPLv2+ licenced
 ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
package/slirp/slirp.mk +4 -4
@@ -7,15 +7,15 @@
 # There's no tarball releases of slirp, so we use the git repo
 # Also, there's no tag, so we use a random SHA1 (master's HEAD
 # of today)
-SLIRP_VERSION         = 8c2da74c1385242f20799fec8c04f8378edc6550
-SLIRP_SITE            = git://anongit.freedesktop.org/spice/slirp
-SLIRP_LICENSE         = BSD-4c BSD-2c
+SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
+SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
+SLIRP_LICENSE = BSD-4c BSD-2c
 # Note: The license file 'COPYRIGHT' is missing from the sources,
 # although some files refer to it.
 SLIRP_INSTALL_STAGING = YES
 
 # As we're using the git tree, there's no ./configure,
 # so we need to autoreconf.
-SLIRP_AUTORECONF      = YES
+SLIRP_AUTORECONF = YES
 
 $(eval $(autotools-package))
package/spice-protocol/spice-protocol.mk +5 -5
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-SPICE_PROTOCOL_VERSION         = 0.12.6
-SPICE_PROTOCOL_SOURCE          = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
-SPICE_PROTOCOL_SITE            = http://www.spice-space.org/download/releases
-SPICE_PROTOCOL_LICENSE         = BSD-3c
-SPICE_PROTOCOL_LICENSE_FILES   = COPYING
+SPICE_PROTOCOL_VERSION = 0.12.6
+SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
+SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
+SPICE_PROTOCOL_LICENSE = BSD-3c
+SPICE_PROTOCOL_LICENSE_FILES = COPYING
 SPICE_PROTOCOL_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
package/spice/spice.mk +6 -6
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-SPICE_VERSION         = 0.12.4
-SPICE_SOURCE          = spice-$(SPICE_VERSION).tar.bz2
-SPICE_SITE            = http://www.spice-space.org/download/releases
-SPICE_LICENSE         = LGPLv2.1+
-SPICE_LICENSE_FILES   = COPYING
+SPICE_VERSION = 0.12.4
+SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
+SPICE_SITE = http://www.spice-space.org/download/releases
+SPICE_LICENSE = LGPLv2.1+
+SPICE_LICENSE_FILES = COPYING
 SPICE_INSTALL_STAGING = YES
-SPICE_DEPENDENCIES    = \
+SPICE_DEPENDENCIES = \
     alsa-lib \
     celt051 \
     jpeg \
package/squid/squid.mk +2 -2
@@ -14,10 +14,10 @@
 SQUID_AUTORECONF = YES
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
-SQUID_CONF_ENV =	ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
+SQUID_CONF_ENV = ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
 			ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
 			ac_cv_func_strnstr=no ac_cv_have_squid=yes
-SQUID_CONF_OPTS =	--enable-async-io=8 --enable-linux-netfilter \
+SQUID_CONF_OPTS = --enable-async-io=8 --enable-linux-netfilter \
 			--enable-removal-policies="lru,heap" \
 			--with-filedescriptors=1024 --disable-ident-lookups \
 			--with-krb5-config=no \
package/sysvinit/sysvinit.mk +3 -3
@@ -5,9 +5,9 @@
 ################################################################################
 
 SYSVINIT_VERSION = 2.88
-SYSVINIT_SOURCE  = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
-SYSVINIT_PATCH   = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
-SYSVINIT_SITE    = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
+SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
+SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
+SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
 SYSVINIT_LICENSE = GPLv2+
 SYSVINIT_LICENSE_FILES = COPYING
 
package/tcllib/tcllib.mk +6 -6
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-TCLLIB_VERSION       = 1.13
-TCLLIB_SOURCE        = tcllib-$(TCLLIB_VERSION).tar.bz2
-TCLLIB_SITE          = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
-TCLLIB_LICENSE       = tcl license
+TCLLIB_VERSION = 1.13
+TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
+TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
+TCLLIB_LICENSE = tcl license
 TCLLIB_LICENSE_FILES = license.terms
-TCLLIB_DEPENDENCIES  = host-tcl
-TCLLIB_CONF_ENV      = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
+TCLLIB_DEPENDENCIES = host-tcl
+TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
 
 $(eval $(autotools-package))
package/tftpd/tftpd.mk +3 -3
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TFTPD_VERSION  = 5.2
-TFTPD_SOURCE   = tftp-hpa-$(TFTPD_VERSION).tar.xz
-TFTPD_SITE     = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
+TFTPD_VERSION = 5.2
+TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
+TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
 TFTPD_CONF_OPTS = --without-tcpwrappers
 
 ifneq ($(BR2_INET_IPV6),y)
package/tstools/tstools.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 TSTOOLS_VERSION = 1_11
-TSTOOLS_SITE    = https://tstools.googlecode.com/files
-TSTOOLS_SOURCE  = tstools-$(TSTOOLS_VERSION).tgz
+TSTOOLS_SITE = https://tstools.googlecode.com/files
+TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
 TSTOOLS_LICENSE = MPL v1.1
 
 define TSTOOLS_BUILD_CMDS
package/tvheadend/tvheadend.mk +1 -1
@@ -51,7 +51,7 @@
 	              $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
 	chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
 endef
-TVHEADEND_POST_INSTALL_TARGET_HOOKS  = TVHEADEND_INSTALL_DB
+TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB
 
 define TVHEADEND_INSTALL_INIT_SYSV
 	$(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend
package/uboot-tools/uboot-tools.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 UBOOT_TOOLS_VERSION = 2014.07
-UBOOT_TOOLS_SOURCE  = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
-UBOOT_TOOLS_SITE    = ftp://ftp.denx.de/pub/u-boot
+UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
+UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
 UBOOT_TOOLS_LICENSE = GPLv2+
 UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
 
package/udisks/udisks.mk +1 -1
@@ -5,7 +5,7 @@
 ################################################################################
 
 UDISKS_VERSION = 1.0.4
-UDISKS_SITE    = http://hal.freedesktop.org/releases
+UDISKS_SITE = http://hal.freedesktop.org/releases
 UDISKS_LICENSE = GPLv2+
 UDISKS_LICENSE_FILES = COPYING
 
package/usbredir/usbredir.mk +8 -8
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-USBREDIR_VERSION         = 0.6
-USBREDIR_SOURCE          = usbredir-$(USBREDIR_VERSION).tar.bz2
-USBREDIR_SITE            = http://spice-space.org/download/usbredir
-USBREDIR_LICENSE         = LGPLv2.1+
-USBREDIR_LICENSE_FILES   = COPYING.LIB
+USBREDIR_VERSION = 0.6
+USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
+USBREDIR_SITE = http://spice-space.org/download/usbredir
+USBREDIR_LICENSE = LGPLv2.1+
+USBREDIR_LICENSE_FILES = COPYING.LIB
 USBREDIR_INSTALL_STAGING = YES
-USBREDIR_DEPENDENCIES    = host-pkgconf libusb
+USBREDIR_DEPENDENCIES = host-pkgconf libusb
 
 ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
 
-USBREDIR_LICENSE         += (for the library), GPLv2+ (for the server)
-USBREDIR_LICENSE_FILES   += COPYING
+USBREDIR_LICENSE += (for the library), GPLv2+ (for the server)
+USBREDIR_LICENSE_FILES += COPYING
 
 else # BR2_PACKAGE_USBREDIR_SERVER != y
 
package/valgrind/valgrind.mk +2 -2
@@ -5,8 +5,8 @@
 ################################################################################
 
 VALGRIND_VERSION = 3.10.0
-VALGRIND_SITE    = http://valgrind.org/downloads
-VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
+VALGRIND_SITE = http://valgrind.org/downloads
+VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPLv2 GFDLv1.2
 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
 VALGRIND_CONF_OPTS = --disable-tls
package/vde2/vde2.mk +6 -6
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-VDE2_VERSION         = 2.3.2
-VDE2_SOURCE          = vde2-$(VDE2_VERSION).tar.bz2
-VDE2_SITE            = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
-VDE2_LICENSE         = GPLv2+ LGPLv2.1+ BSD-3c
-VDE2_LICENSE_FILES   = COPYING COPYING.libvdeplug COPYING.slirpvde
+VDE2_VERSION = 2.3.2
+VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
+VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
+VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c
+VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
 VDE2_INSTALL_STAGING = YES
 
 # We touch configure.ac, so we need to autoreconf
-VDE2_AUTORECONF      = YES
+VDE2_AUTORECONF = YES
 
 # Reasons for enabling/disabling stuff:
 #?- tuntap is enabled in the hope we're using a recent-enough toolchain
package/vpnc/vpnc.mk +5 -5
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-VPNC_VERSION       = 0.5.3
-VPNC_SITE          = http://www.unix-ag.uni-kl.de/~massar/vpnc
-VPNC_LICENSE       = GPLv2+
+VPNC_VERSION = 0.5.3
+VPNC_SITE = http://www.unix-ag.uni-kl.de/~massar/vpnc
+VPNC_LICENSE = GPLv2+
 VPNC_LICENSE_FILES = COPYING
 
-VPNC_DEPENDENCIES  = libgcrypt libgpg-error
+VPNC_DEPENDENCIES = libgcrypt libgpg-error
 
-VPNC_LDFLAGS  = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
+VPNC_LDFLAGS = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
 VPNC_CPPFLAGS = -DVERSION=\\\"$(VPNC_VERSION)\\\"
 
 define VPNC_BUILD_CMDS
package/xinetd/xinetd.mk +3 -3
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XINETD_VERSION       = 2.3.15
-XINETD_SITE          = http://www.xinetd.org
-XINETD_LICENSE       = xinetd license
+XINETD_VERSION = 2.3.15
+XINETD_SITE = http://www.xinetd.org
+XINETD_LICENSE = xinetd license
 XINETD_LICENSE_FILES = COPYRIGHT
 
 XINETD_CFLAGS = $(TARGET_CFLAGS)
toolchain/toolchain-external/toolchain-external.mk +3 -3
@@ -333,15 +333,15 @@
 TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
-TOOLCHAIN_EXTERNAL_SITE   = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
 TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)
-TOOLCHAIN_EXTERNAL_SITE   = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386/
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386/
 TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2013R1-RC1.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1),y)
-TOOLCHAIN_EXTERNAL_SITE   = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386/
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386/
 TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2
 TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#12 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 13 lines · Yann E. MORIN

package/pkg-cmake.mk line 44

Quoted 9 lines
package/pkg-cmake.mk +1 -1
@@ -41,7 +41,7 @@
 $(2)_MAKE			?= $$(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_HOST_OPT		?= install
+$(2)_INSTALL_HOST_OPTS		?= install

The other infras do not use a 'HOST_' in the middle of host-variant variables; 'HOST_' is only present at the beginning.

Quoted 7 lines

For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.

So, I find there is a bit of discrepancy in this variable naming. Plus, it is not documented in the manual.

Samuel, is there a reason for the naming of this variable?

I fully agree with Yann comments here. Samuel, could you answer Yann's question?

Is anyone willing to cook a patch to fix this?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#13 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS

Hi all,

Quoted 24 lines · Thomas Petazzoni

Dear Yann E. MORIN,

Quoted 20 lines · Yann E. MORIN

package/pkg-cmake.mk line 44

Quoted 9 lines
package/pkg-cmake.mk +1 -1
@@ -41,7 +41,7 @@
 $(2)_MAKE                  ?= $$(MAKE)
 $(2)_MAKE_ENV                      ?=
 $(2)_MAKE_OPTS                     ?=
-$(2)_INSTALL_HOST_OPT              ?= install
+$(2)_INSTALL_HOST_OPTS             ?= install

The other infras do not use a 'HOST_' in the middle of host-variant variables; 'HOST_' is only present at the beginning.

For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.

So, I find there is a bit of discrepancy in this variable naming. Plus, it is not documented in the manual.

Samuel, is there a reason for the naming of this variable?

Oops, sorry guys I missed this one :-s

Quoted 3 lines

I fully agree with Yann comments here. Samuel, could you answer Yann's question?

I agree, it is not consistent with the other infras. Afaics, it's here since the original introduction of the cmake infra; we missed this at that time :-/

Quoted 2 lines

Is anyone willing to cook a patch to fix this?

I can do it.
Fortunately no host-cmake package needs/uses install opts ;-)

Regards,

Signature · 1 line
Samuel
#41 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

In reply to Thomas De Schampheleire

Dear Thomas De Schampheleire,

Quoted 6 lines · Thomas De Schampheleire

Thomas De Schampheleire (15)
packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS

Quoted 8 lines

packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
pkg-generic: introduce helper function to check for a deprecated variable
pkg-generic: add checks on deprecated variables FOO_BAR_OPT
packages: rename misc. occurrences of _OPT into _OPTS

I've applied those 13 first patches. I only have a comment about "pkg-generic: introduce helper function to check for a deprecated variable" and "pkg-generic: add checks on deprecated variables FOO_BAR_OPT", which I'll make on the relevant patches. My comments can be handled as followup patches now that those patches have been merged.

Quoted 2 lines

.mk files: remove alignment of line continuation characters .mk files: remove alignment of assignments

On those ones, I must say I'm not sure. Do we really have a coding style for line continuation characters? In some cases, I found the original code (i.e before your patch) to actually be nicer than after your change.

For the alignment of assignments, I generally agree, but:

1/ I believe there should be exceptions to the rules. Especially inside the package infrastructure themselves, aligning = signs is sometimes good for readability

2/ Your regex doesn't handle cases such as:

FOO ?=
BAR ?= $(SOMETHING)

The second assignment gets changed, but not the first one.

So on those last two patches, I'd like to have more community feedback.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#26 lore raw

PATCH 1/1 pkg-generic: introduce helper function to check for a deprecated variable

In reply to Thomas De Schampheleire

Dear Thomas De Schampheleire,

Quoted 4 lines · Thomas De Schampheleire

################################################################################

package/pkg-generic.mk +3 -0
+# check-deprecated-variable -- throw an error on deprecated variables
+#
+# argument 1 is the deprecated variable

package/pkg-generic.mk line 279

Quoted 10 lines
package/pkg-generic.mk +10 -0
+# argument 2 is the new variable to use
+#
+# example:
+#   $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
+################################################################################
+define check-deprecated-variable
+ifneq ($$(origin $(1)),undefined)
+$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
+endif
+endef

This helper should rather go in pkg-utils.mk. See my comment on PATCH 12 for explanations.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#14 lore raw

PATCH 1/1 packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS

In reply to Thomas Petazzoni

Thomas, All,

On 2014-10-04 18:52 +0200, Thomas Petazzoni spake thusly:

Quoted 21 lines · Yann E. MORIN
Quoted 20 lines

package/pkg-cmake.mk line 44

Quoted 10 lines
package/pkg-cmake.mk +1 -1
@@ -41,7 +41,7 @@
 $(2)_MAKE			?= $$(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPTS			?=
-$(2)_INSTALL_HOST_OPT		?= install
+$(2)_INSTALL_HOST_OPTS		?= install

The other infras do not use a 'HOST_' in the middle of host-variant variables; 'HOST_' is only present at the beginning.

For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.

So, I find there is a bit of discrepancy in this variable naming. Plus, it is not documented in the manual.

Quoted 6 lines
Quoted 1 line

Samuel, is there a reason for the naming of this variable?

I fully agree with Yann comments here. Samuel, could you answer Yann's question?

Is anyone willing to cook a patch to fix this?

I'll do, but not before this patch is applied ;-), otherwise it will again be a nightmare to rebase...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#29 lore raw

PATCH 1/1 pkg-generic: add checks on deprecated variables FOO_BAR_OPT

In reply to Thomas De Schampheleire

Dear Thomas De Schampheleire,

Quoted 11 lines · Thomas De Schampheleire

+# Ensure unified variable name conventions between all packages
+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))

I think the legacy variable checking should go to the respective package infrastructure they belong to: AUTORECONF_OPT and GETTEXTIZE_OPT should go to pkg-autotools.mk, KCONFIG_OPT to pkg-kconfig.mk, etc.

The pkg-generic.mk infrastructure doesn't know anything about those variables, so there's no reason to have those checks at this level.

Care to cook a followup patch fixing that?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#30 lore raw

PATCH 1/1 pkg-generic: add checks on deprecated variables FOO_BAR_OPT

Thomas?, All,

On 2014-10-04 19:14 +0200, Thomas Petazzoni spake thusly:

Quoted 14 lines · Thomas De Schampheleire
Quoted 12 lines

+# Ensure unified variable name conventions between all packages
+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))

Quoted 7 lines

I think the legacy variable checking should go to the respective package infrastructure they belong to: AUTORECONF_OPT and GETTEXTIZE_OPT should go to pkg-autotools.mk, KCONFIG_OPT to pkg-kconfig.mk, etc.

The pkg-generic.mk infrastructure doesn't know anything about those variables, so there's no reason to have those checks at this level.

I agree on principle.

However, having all of them right here avoids duplication. For example:
- $(2)_BUILD_OPT was valid for lua, perl and python packages,
- $(2)_CONF_OPT was valid for autotools, cmake and perl packages,
- ...

Would you find appropriate that the checks be duplicated in all of the impacted infras?

Note: I don't mind either way, just inquiring.

Quoted 1 line

Care to cook a followup patch fixing that?

I can have a spin at it tomorrow, unless Thomas DS is not completely fed up with this series! ;-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#31 lore raw

PATCH 1/1 pkg-generic: add checks on deprecated variables FOO_BAR_OPT

Hi Thomas, Yann,

Quoted 35 lines · Yann E. MORIN

Thomas?, All,

On 2014-10-04 19:14 +0200, Thomas Petazzoni spake thusly:

Quoted 14 lines · Thomas De Schampheleire
Quoted 12 lines

+# Ensure unified variable name conventions between all packages
+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))

Quoted 7 lines

I think the legacy variable checking should go to the respective package infrastructure they belong to: AUTORECONF_OPT and GETTEXTIZE_OPT should go to pkg-autotools.mk, KCONFIG_OPT to pkg-kconfig.mk, etc.

The pkg-generic.mk infrastructure doesn't know anything about those variables, so there's no reason to have those checks at this level.

I agree on principle.

However, having all of them right here avoids duplication. For example:
- $(2)_BUILD_OPT was valid for lua, perl and python packages,
- $(2)_CONF_OPT was valid for autotools, cmake and perl packages,
- ...

Would you find appropriate that the checks be duplicated in all of the impacted infras?

Quoted 6 lines

Note: I don't mind either way, just inquiring.

Quoted 1 line

Care to cook a followup patch fixing that?

I can have a spin at it tomorrow, unless Thomas DS is not completely fed up with this series! ;-)

For such small changes I make an exception :)

I more or less feel the same as Yann: for some variables we can indeed move, but for others I'm not sure.
Here is the list:

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))

Such variables are used by several infras, like autotools and cmake. So moving them to one in particular is odd. Duplicating them would be equally undesirable.
So in this case pkg-generic.mk seems the better place to me.

Moreover, even if only one specialized infra would use such a variable, generic packages sometimes use the same common names like FOO_MAKE_OPTS for variables, even though their name is really arbitrary.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))

This can be moved to pkg-autotools.mk, it makes more sense there.

Quoted 1 line
Quoted 1 line
Quoted 1 line

+$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))

This variable serves basically the same function as FOO_MAKE_OPTS, but I guess it's not called '_MAKE_' because these infras (perl, python, ...) do not pass them to make.
Since they are re-used in several ones I tend to place them in pkg-generic too.

Quoted 1 line
Quoted 1 line
Quoted 1 line

+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))

This can be moved to package/pkg-kconfig indeed.

Best regards,
Thomas

#32 lore raw

PATCH 1/1 pkg-generic: add checks on deprecated variables FOO_BAR_OPT

Dear Thomas De Schampheleire,

Quoted 11 lines · Thomas De Schampheleire
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))

Such variables are used by several infras, like autotools and cmake. So moving them to one in particular is odd. Duplicating them would be equally undesirable.
So in this case pkg-generic.mk seems the better place to me.

Hum, right, I didn't realize that.

Quoted 4 lines

Moreover, even if only one specialized infra would use such a variable, generic packages sometimes use the same common names like FOO_MAKE_OPTS for variables, even though their name is really arbitrary.

Yes. Though it's kind of weird to "enforce" the non-usage of <foo>_MAKE_OPT for generic-package, since such a variable is not defined by the package infrastructure, and its naming left to the choice of the package writer. But since we indeed want to see <foo>_MAKE_OPTS being used instead, probably it makes sense.

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))

This can be moved to pkg-autotools.mk, it makes more sense there.

Quoted 1 line
Quoted 1 line
Quoted 1 line

+$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))

Quoted 8 lines

This variable serves basically the same function as FOO_MAKE_OPTS, but I guess it's not called '_MAKE_' because these infras (perl, python, ...) do not pass them to make.
Since they are re-used in several ones I tend to place them in pkg-generic too.

Quoted 1 line
Quoted 1 line
Quoted 1 line

+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))

This can be moved to package/pkg-kconfig indeed.

Yeah, well, with this duplication thing, I'm no longer sure it's really worth the effort. Maybe for clarity it's better to just duplicate what needs to be duplicated, instead of having some variables handled in each individual package infra, and some others at the pkg-generic level even though they are specific to some package infrastructures?

No strong feeling here.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#33 lore raw

PATCH 1/1 pkg-generic: add checks on deprecated variables FOO_BAR_OPT

Hi Thomas,

Quoted 45 lines · Thomas Petazzoni

Dear Thomas De Schampheleire,

Quoted 11 lines · Thomas De Schampheleire
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))

Such variables are used by several infras, like autotools and cmake. So moving them to one in particular is odd. Duplicating them would be equally undesirable.
So in this case pkg-generic.mk seems the better place to me.

Hum, right, I didn't realize that.

Quoted 4 lines

Moreover, even if only one specialized infra would use such a variable, generic packages sometimes use the same common names like FOO_MAKE_OPTS for variables, even though their name is really arbitrary.

Yes. Though it's kind of weird to "enforce" the non-usage of <foo>_MAKE_OPT for generic-package, since such a variable is not defined by the package infrastructure, and its naming left to the choice of the package writer. But since we indeed want to see <foo>_MAKE_OPTS being used instead, probably it makes sense.

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))

This can be moved to pkg-autotools.mk, it makes more sense there.

Quoted 1 line
Quoted 1 line
Quoted 1 line

+$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))

Quoted 8 lines

This variable serves basically the same function as FOO_MAKE_OPTS, but I guess it's not called '_MAKE_' because these infras (perl, python, ...) do not pass them to make.
Since they are re-used in several ones I tend to place them in pkg-generic too.

Quoted 1 line
Quoted 1 line
Quoted 1 line

+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))

This can be moved to package/pkg-kconfig indeed.

Quoted 7 lines

Yeah, well, with this duplication thing, I'm no longer sure it's really worth the effort. Maybe for clarity it's better to just duplicate what needs to be duplicated, instead of having some variables handled in each individual package infra, and some others at the pkg-generic level even though they are specific to some package infrastructures?

No strong feeling here.

I'm not sure what you mean here.
There doesn't need to be any duplication, unless you prefer to check for, say, FOO_MAKE_OPT in several infras instead of in generic.

I did the moving around, I'll send the patches now so you can see and we can decide the final solution.

Best regards,
Thomas

#42 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

In reply to Thomas Petazzoni

Thomas2, All,

On 2014-10-04 19:07 +0200, Thomas Petazzoni spake thusly:

Quoted 8 lines · Thomas De Schampheleire
Quoted 2 lines

.mk files: remove alignment of line continuation characters .mk files: remove alignment of assignments

On those ones, I must say I'm not sure. Do we really have a coding style for line continuation characters? In some cases, I found the original code (i.e before your patch) to actually be nicer than after your change.

Well, I do like alignment of \, because it is easier to see the lines are a single block.

But I prefer consistency.

Quoted 6 lines

For the alignment of assignments, I generally agree, but:

1/ I believe there should be exceptions to the rules. Especially inside the package infrastructure themselves, aligning = signs is sometimes good for readability

Quoted 8 lines

2/ Your regex doesn't handle cases such as:

FOO ?=
BAR ?= $(SOMETHING)

The second assignment gets changed, but not the first one.

So on those last two patches, I'd like to have more community feedback.

Being consistent is nice. However, I find a bulk clean-up is very complex to do:

- as you found, some assignments were not cleaned-up; it is difficult

    to find a pattern that matches all cases, and has no false-positives;

- it is difficult to review, because of the sheer amount of changes in a single patch.

So I would prefer we fix offenders whenever there is another patch being done for it. For example, when a version is bumped, a preliminary patch would introduce the cleanup (with the first two changes possibly being conflated in a single patch if it is easy to review):

foo: remove backslash alignment
foo: remove assignments alignment
foo: bump version

This is something very easy to do, and review.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#43 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

Dear Yann E. MORIN,

Quoted 7 lines · Yann E. MORIN
Quoted 4 lines

On those ones, I must say I'm not sure. Do we really have a coding style for line continuation characters? In some cases, I found the original code (i.e before your patch) to actually be nicer than after your change.

Well, I do like alignment of \, because it is easier to see the lines are a single block.

I also personally like the alignment of \, so I tend to disagree a bit with the patch removing this.

Regarding the alignment of =, my point of view is that there are different cases. Within packages, I agree it probably doesn't make much sense to align = signs. However, within the core infrastructure, there are situations where it really make seems more "beautiful" to read.

Quoted 14 lines

Being consistent is nice. However, I find a bulk clean-up is very complex to do:

- as you found, some assignments were not cleaned-up; it is difficult

    to find a pattern that matches all cases, and has no false-positives;

- it is difficult to review, because of the sheer amount of changes in a single patch.

So I would prefer we fix offenders whenever there is another patch being done for it. For example, when a version is bumped, a preliminary patch would introduce the cleanup (with the first two changes possibly being conflated in a single patch if it is easy to review):

Quoted 5 lines

foo: remove backslash alignment
foo: remove assignments alignment
foo: bump version

This is something very easy to do, and review.

I agree.

Summary: I mark as rejected those two patches?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#44 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

Hi Thomas, Yann,

Quoted 39 lines · Thomas Petazzoni

Dear Yann E. MORIN,

Quoted 7 lines · Yann E. MORIN
Quoted 4 lines

On those ones, I must say I'm not sure. Do we really have a coding style for line continuation characters? In some cases, I found the original code (i.e before your patch) to actually be nicer than after your change.

Well, I do like alignment of \, because it is easier to see the lines are a single block.

I also personally like the alignment of \, so I tend to disagree a bit with the patch removing this.

Regarding the alignment of =, my point of view is that there are different cases. Within packages, I agree it probably doesn't make much sense to align = signs. However, within the core infrastructure, there are situations where it really make seems more "beautiful" to read.

Quoted 18 lines

Being consistent is nice. However, I find a bulk clean-up is very complex to do:

- as you found, some assignments were not cleaned-up; it is difficult

    to find a pattern that matches all cases, and has no false-positives;

- it is difficult to review, because of the sheer amount of changes in a single patch.

So I would prefer we fix offenders whenever there is another patch being done for it. For example, when a version is bumped, a preliminary patch would introduce the cleanup (with the first two changes possibly being conflated in a single patch if it is easy to review):

foo: remove backslash alignment
foo: remove assignments alignment
foo: bump version

Quoted 5 lines
Quoted 1 line

This is something very easy to do, and review.

I agree.

Summary: I mark as rejected those two patches?

The reason these patches were part of the _OPT series was that due to the introduction of an extra letter, some alignment was broken. If we do not removal all alignment consistently, then how do you propose to handle this?

a. do nothing, and thus let the alignment be broken
b. expect the submitter of such renaming changes to fix the specific alignment issues he/she introduced? (which is painful (but not impossible) since the renaming typically happens with an automated command or script)
c. remove all fragile alignment in one go, so that such problems do not occur.

In my original patches I went for reasoning c.
How would you handle the alignment issue instead?

Thanks,
Thomas

#45 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

Dear Thomas De Schampheleire,

Quoted 12 lines · Thomas De Schampheleire

The reason these patches were part of the _OPT series was that due to the introduction of an extra letter, some alignment was broken. If we do not removal all alignment consistently, then how do you propose to handle this?

a. do nothing, and thus let the alignment be broken
b. expect the submitter of such renaming changes to fix the specific alignment issues he/she introduced? (which is painful (but not impossible) since the renaming typically happens with an automated command or script)
c. remove all fragile alignment in one go, so that such problems do not occur.

Quoted 2 lines

In my original patches I went for reasoning c.
How would you handle the alignment issue instead?

Good question. For now, I'm tempted to say (a) :-)

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#46 lore raw

PATCH 1/1 packages: rename FOO_BAR_OPT into FOO_BAR_OPTS

In reply to Yann E. MORIN

Hi Yann, Thomas,

Quoted 30 lines · Yann E. MORIN

Thomas2, All,

On 2014-10-04 19:07 +0200, Thomas Petazzoni spake thusly:

Quoted 8 lines · Thomas De Schampheleire
Quoted 2 lines

.mk files: remove alignment of line continuation characters .mk files: remove alignment of assignments

On those ones, I must say I'm not sure. Do we really have a coding style for line continuation characters? In some cases, I found the original code (i.e before your patch) to actually be nicer than after your change.

Well, I do like alignment of \, because it is easier to see the lines are a single block.

But I prefer consistency.

Quoted 13 lines

For the alignment of assignments, I generally agree, but:

1/ I believe there should be exceptions to the rules. Especially inside the package infrastructure themselves, aligning = signs is sometimes good for readability

2/ Your regex doesn't handle cases such as:

FOO ?=
BAR ?= $(SOMETHING)

The second assignment gets changed, but not the first one.

Quoted 7 lines
Quoted 1 line

So on those last two patches, I'd like to have more community feedback.

Being consistent is nice. However, I find a bulk clean-up is very complex to do:

- as you found, some assignments were not cleaned-up; it is difficult

    to find a pattern that matches all cases, and has no false-positives;

In this case I think it's not that hard. The issue pointed to by Thomas is indeed an oversight, but one that can be fixed quite easily.

Quoted 9 lines

- it is difficult to review, because of the sheer amount of changes in a single patch.

So I would prefer we fix offenders whenever there is another patch being done for it. For example, when a version is bumped, a preliminary patch would introduce the cleanup (with the first two changes possibly being conflated in a single patch if it is easy to review):

Quoted 5 lines

foo: remove backslash alignment
foo: remove assignments alignment
foo: bump version

This is something very easy to do, and review.

You mentioned above that reviewing a bulk change in one patch is difficult. I understand, but rather I'd call it 'boring' and 'time-intensive' rather than 'difficult' because the changes are trivial.

Regarding your suggested alternative, doing the same changes but split per package and 'when the time is right' (i.e. someone needs to make a change to that same package), my opinion is:

a. making the change 'when the time is right' has as disadvantages that:
- not every developer will notice this issue and does do the alignment fixes
- it causes a long timeframe of inconsistency: some packages have
alignment, some don't, and given that many people copy/paste from other examples it leaks the 'wrong' behavior to new developments.
Review is a solution to both issues, but it is easy to miss some
things (for the first one especially since the change in the package may not touch any of the misaligned lines).

b. the split-patch approach could also be done in bulk, i.e. I could just as easily do a bulk replacement now and make patches per package. Of course it would be many patches (138 for the assignment alignment, 58 for the line continuation) at once which all need to be reviewed. However, since they're split per package it is more easy to review at several moments (spread over a few days for example) and to spread the effort over several developers.

In summary, I tend to prefer a bulk change (in one or multiple patches, I don't mind) to have consistency in one go. The same approach was taken for the Config.in comments I once changed (toolchain options etc.)

Best regards,
Thomas