Update for numerous lfs-files: removed deprecated configure options

Also includes some reformatting, but no changes to configuration.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

lfs/autoconf

@@ -69,7 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/automake

@@ -81,8 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
-	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
+	cd $(DIR_APP) && ./configure \
-			--docdir=/usr/share/doc/automake-1.15
+		--prefix=$(PREFIX) \
+		--docdir=/usr/share/doc/automake-1.15
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/cyrus-imapd

@@ -77,11 +77,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \
+	cd $(DIR_APP) && ./configure \
-				--with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \
+		--prefix=/usr \
-				--with-auth=unix --with-perl --with-sasl --with-idle=idled \
+		--with-service-path=/usr/lib/cyrus \
-				--with-syslogfacility=MAIL --enable-listext --without-snmp \
+		--with-cyrus-prefix=/usr/lib/cyrus \
-				--enable-autocreate --enable-idled
+		--sysconfdir=/var/ipfire/cyrusimap \
+		--with-perl \
+		--with-sasl \
+		--with-syslogfacility=MAIL \
+		--without-snmp \
+		--enable-autocreate \
+		--enable-idled
+
 	cd $(DIR_APP) && make $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	-mkdir /var/imap

lfs/dhcp

@@ -107,7 +107,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--prefix=/usr \
 			--sysconfdir=/etc/dhcp \
 			--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-			--disable-static \
 			--enable-paranoia \
 			--enable-early-chroot \
 			--disable-dhcpv6

lfs/e2fsprogs

@@ -76,8 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--prefix=/usr \
 			--with-root-prefix="" \
 			--enable-elf-shlibs \
-			--disable-evms \
 			--disable-nls
+
 	cd $(DIR_APP)/build && make $(MAKETUNING)
 	cd $(DIR_APP)/build && make install
 	cd $(DIR_APP)/build && make install-libs

lfs/expat

@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)

lfs/faad2

@@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-shared
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/fcron

@@ -70,22 +70,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure	\
+	cd $(DIR_APP) && ./configure \
-	    --prefix=/usr			\
+		--prefix=/usr \
-	    --disable-nls			\
+		--without-sendmail \
-	    --without-sendmail		\
+		--with-spooldir=/var/spool/cron \
-	    --with-spooldir=/var/spool/cron 	\
+		--with-fifodir=/var/run \
-	    --with-fifodir=/var/run	 	\
+		--with-piddir=/var/run \
-	    --with-piddir=/var/run	 	\
+		--sysconfdir=/etc \
-	    --sysconfdir=/etc		 	\
+		--with-username=cron \
-	    --with-username=cron		\
+		--with-groupname=cron \
-	    --with-groupname=cron		\
+		--with-run-non-privileged=no \
-	    --with-run-non-privileged=no	\
+		--with-fcrondyn=no \
-	    --with-fcrondyn=no		\
+		--with-sysfcrontab=no \
-	    --with-sysfcrontab=no		\
+		--with-boot-install=no \
-	    --with-boot-install=no		\
+		--with-pam=no \
-	    --with-pam=no			\
+		--with-selinux=no
-	    --with-selinux=no
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	echo "root" > /etc/fcron.allow

lfs/ffmpeg

@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-version3 \
 		--enable-avfilter \
 		--enable-avresample
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/fuse

@@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
@@ -74,7 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/ghostscript

@@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
-			--with-system-libtiff \
+			--with-system-libtiff
-			--with-install-cups
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 

lfs/gmp

@@ -39,9 +39,7 @@ endif
 
 CONFIGURE_OPTIONS = \
 	--prefix=/usr \
-	--enable-cxx \
+	--enable-cxx
-	--enable-mpbsd \
-	--disable-nls
 
 ###############################################################################
 # Top-level Rules

lfs/groff

@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
+	cd $(DIR_APP) && PAGE=A4 ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	ln -svf eqn /usr/bin/geqn

lfs/gzip

@@ -35,10 +35,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin
+  EXTRA_CONFIG = --prefix=/usr --bindir=/bin
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif
 
 ###############################################################################

lfs/kmod

@@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--prefix=/usr \
 		--bindir=/bin \
 		--sysconfdir=/etc \
-		--enable-zlib \
 		--disable-manpages
 
 #		--libdir=/lib \

lfs/less

@@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/libjpeg-compat

@@ -72,7 +72,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-static \
+		--enable-shared
+
 	cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/

lfs/libmpeg2

@@ -77,8 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared \
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-shared \
 		--disable-accel-detect
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/libtool

@@ -75,7 +75,9 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/libupnp

@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/libusb

@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules

lfs/m4

@@ -35,12 +35,12 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
-  EXTRA_MAKE = 
+  EXTRA_MAKE =
 endif
 
 ###############################################################################

lfs/mpfr

@@ -71,7 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
-			--enable-thread-safe --disable-nls
+		--enable-thread-safe
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/nasm

@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && ./configure \
+	--prefix=/usr
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/openssh

@@ -71,29 +71,33 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
+	cd $(DIR_APP) && ./configure \
-		    --libexecdir=/usr/lib/openssh --with-md5-passwords \
+		--prefix=/usr \
-		    --with-privsep-path=/var/empty --disable-nls \
+		--sysconfdir=/etc/ssh \
-		    --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+		--libexecdir=/usr/lib/openssh \
+		--with-md5-passwords \
+		--with-privsep-path=/var/empty \
+		--with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	sed -i -e 's/^#\?Port .*$$/Port 222/' \
-	    -e 's/^#\?Protocol .*$$/Protocol 2/' \
+		-e 's/^#\?Protocol .*$$/Protocol 2/' \
-	    -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
+		-e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-	    -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
+		-e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
-	    -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
+		-e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
-	    -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
+		-e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
-	    -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
+		-e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
-	    -e 's/^#\?UsePAM .*$$//' \
+		-e 's/^#\?UsePAM .*$$//' \
-	    -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
+		-e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
-	    -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
+		-e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
-	    -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
+		-e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
-	    -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
+		-e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
-	    -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
+		-e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
-	    -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
+		-e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
-	    /etc/ssh/sshd_config
+		/etc/ssh/sshd_config
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

lfs/openvmtools

@@ -81,13 +81,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
 	cd $(DIR_APP) && autoreconf -vfi
-	cd $(DIR_APP) && ./configure --prefix=/usr \
+
-	   --with-kernel-release=$(KVER)-ipfire --without-pam \
+	cd $(DIR_APP) && ./configure \
-	   --disable-unity --without-gtk2 --without-gtkmm \
+		--prefix=/usr \
-	   --without-procps --without-icu \
+		--with-kernel-release=$(KVER)-ipfire \
-	   --without-x --with-linuxdir=/usr/src/linux \
+		--without-pam \
-	   --without-kernel-modules --disable-deploypkg \
+		--without-gtk2 \
-	   --without-xerces-c --without-xerces
+		--without-gtkmm \
+		--without-procps \
+		--without-icu \
+		--without-x \
+		--with-linuxdir=/usr/src/linux \
+		--without-kernel-modules \
+		--disable-deploypkg \
+		--without-xerces
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	#install initscripts

lfs/patch

@@ -35,14 +35,14 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
   EXTRA_MAKE =
-  EXTRA_INSTALL = 
+  EXTRA_INSTALL =
 endif
 
 ###############################################################################

lfs/python

@@ -73,7 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch
 	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-		--prefix=/usr --enable-shared --with-system-ffi
+		--prefix=/usr \
+		--enable-shared \
+		--with-system-ffi
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/python3

@@ -79,7 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
 	cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-		--prefix=/usr --enable-shared --with-system-ffi
+		--prefix=/usr \
+		--enable-shared \
+		--with-system-ffi
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/rpcbind

@@ -79,7 +79,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--bindir=/sbin \
+		--with-rpcuser=root \
+		--without-systemdsystemunitdir
+
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	#install initscripts

lfs/shadow

@@ -71,12 +71,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
-	cd $(DIR_APP) && ./configure --libdir=/lib	\
+	cd $(DIR_APP) && ./configure \
-				--sysconfdir=/etc	\
+		--libdir=/lib \
-				--enable-shared		\
+		--sysconfdir=/etc \
-				--without-selinux	\
+		--enable-shared \
-				--disable-nls		\
+		--without-selinux \
-				--with-group-name-max-length=32
+		--disable-nls \
+		--with-group-name-max-length=32
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 

lfs/taglib

@@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
 	@$(PAK)
 
 ###############################################################################
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)

lfs/tcl

@@ -76,9 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifneq "$(ROOT)" ""
-	cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) --disable-nls
+	cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR)
 else
-	cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP)/unix && ./configure --prefix=/usr
 endif
 	cd $(DIR_APP)/unix && make $(MAKETUNING)
 	cd $(DIR_APP)/unix && make install