Commit ffa33dc5 authored by Jörg Krause's avatar Jörg Krause Committed by Thomas Petazzoni
Browse files

package/.mk files: remove --localstatedir=/var from autotools packages 



Remove --localstatedir=/var from all autotools packages where it is no longer
needed.

Also remove --localstatedir=/var/lib/dhcp from package dhcp. localstatedir is
used by dhcp to set the default directory for the leases files. This can also
be done by setting --with-*-lease-file=/var/lib/dhcp/*, which is done in
dhcp.mk.

A custom --localstatedir is left in:
* proftpd.mk
* mysql.mk

This is safe to do:
One of the good thing with autoconf is that if you pass:
        --localstatedir=/var ... --localstatedir=/var/something
Then /var/something will be used. So, we can set --localstatedir=/var
by default in the infrastructure, and still have certain packages doing
weird things override it. [Thanks to Thomas Petazzoni]

Signed-off-by: default avatarJörg Krause <jkrause@posteo.de>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b3ed7c2d

package/avahi/avahi.mk

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ AVAHI_CONF_ENV = ac_cv_func_strtod=yes \ 
		avahi_cv_sys_cxx_works=yes \

		DATADIRNAME=share



AVAHI_CONF_OPTS = --localstatedir=/var \

AVAHI_CONF_OPTS = \

		--disable-qt3 \

		--disable-qt4 \

		--disable-gdbm \

package/bind/bind.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone 
BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate

BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \

		BUILD_CFLAGS="$(TARGET_CFLAGS)"

BIND_CONF_OPTS = --localstatedir=/var \

BIND_CONF_OPTS = \

		--with-randomdev=/dev/urandom \

		--enable-epoll --with-libtool \

		--with-gssapi=no --enable-rrl

package/collectd/collectd.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \ 
COLLECTD_CONF_ENV += LIBS="-lm"



COLLECTD_CONF_OPTS += --with-nan-emulation --with-fp-layout=nothing \

	--localstatedir=/var --with-perl-bindings=no \

	--with-perl-bindings=no \

	$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \

	$(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \

	$(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \

package/connman/connman.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ CONNMAN_DEPENDENCIES = libglib2 dbus iptables 
CONNMAN_INSTALL_STAGING = YES

CONNMAN_LICENSE = GPLv2

CONNMAN_LICENSE_FILES = COPYING

CONNMAN_CONF_OPTS += --localstatedir=/var \

CONNMAN_CONF_OPTS += \

	$(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)			\

package/cups/cups.mk

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ CUPS_CONF_OPTS = --without-perl \ 
		--without-php \

		--disable-gnutls \

		--disable-gssapi \

		--libdir=/usr/lib \

		--localstatedir=/var

		--libdir=/usr/lib

CUPS_CONFIG_SCRIPTS = cups-config



CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \