* beautification

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@658 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 40 insertions, 27 deletions

diff --git a/rules/pdksh.make b/rules/pdksh.make
index 63461a868..aa7e22d5b 100644
--- a/rules/pdksh.make
+++ b/rules/pdksh.make
@@ -1,8 +1,9 @@
 # -*-makefile-*-
-# $Id: pdksh.make,v 1.9 2003/10/23 15:01:19 mkl Exp $
+# $Id: pdksh.make,v 1.10 2003/10/26 13:31:45 mkl Exp $
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
+#
 # See CREDITS for details about who has contributed to this project. 
 #
 # For further information about the PTXdist project and license conditions
@@ -12,7 +13,7 @@
 #
 # We provide this package
 #
-ifeq (y, $(PTXCONF_PDKSH))
+ifdef PTXCONF_PDKSH
 PACKAGES += pdksh
 endif
 
@@ -23,7 +24,6 @@ PDKSH			= pdksh-5.2.14
 PDKSH_URL		= ftp://ftp.cs.mun.ca/pub/pdksh/$(PDKSH).tar.gz 
 PDKSH_SOURCE		= $(SRCDIR)/$(PDKSH).tar.gz
 PDKSH_DIR		= $(BUILDDIR)/$(PDKSH)
-PDKSH_EXTRACT 		= gzip -dc
 
 # ----------------------------------------------------------------------------
 # Get
@@ -37,7 +37,7 @@ $(STATEDIR)/pdksh.get: $(PDKSH_SOURCE)
 
 $(PDKSH_SOURCE):
 	@$(call targetinfo, $@)
-	wget -P $(SRCDIR) $(PASSIVEFTP) $(PDKSH_URL)
+	@$(call get, $(PDKSH_URL))
 
 # ----------------------------------------------------------------------------
 # Extract
@@ -48,7 +48,7 @@ pdksh_extract: $(STATEDIR)/pdksh.extract
 $(STATEDIR)/pdksh.extract: $(STATEDIR)/pdksh.get
 	@$(call targetinfo, $@)
 	@$(call clean, $(PDKSH_DIR))
-	$(PDKSH_EXTRACT) $(PDKSH_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+	@$(call extract, $(PDKSH_SOURCE))
 	touch $@
 
 # ----------------------------------------------------------------------------
@@ -57,52 +57,64 @@ $(STATEDIR)/pdksh.extract: $(STATEDIR)/pdksh.get
 
 pdksh_prepare: $(STATEDIR)/pdksh.prepare
 
-PDKSH_AUTOCONF	=  --build=$(GNU_HOST)
-PDKSH_AUTOCONF	+= --host=$(PTXCONF_GNU_TARGET)
-PDKSH_AUTOCONF	+= --target=$(PTXCONF_GNU_TARGET)
-PDKSH_AUTOCONF	+= --disable-sanity-checks
-PDKSH_AUTOCONF	+= --prefix=/usr
+PDKSH_AUTOCONF = \
+	--build=$(GNU_HOST) \
+	--host=$(PTXCONF_GNU_TARGET) \
+	--target=$(PTXCONF_GNU_TARGET) \
+	--disable-sanity-checks \
+	--prefix=/usr
 
 PDKSH_PATH	=  PATH=$(CROSS_PATH)
-PDKSH_ENV	=  ac_cv_sizeof_long=4 ac_cv_sizeof_int=4 ac_cv_func_mmap=yes
-PDKSH_ENV	+= ksh_cv_func_memmove=yes
-PDKSH_ENV	+= ksh_cv_func_times_ok=yes ksh_cv_pgrp_check=posix
-PDKSH_ENV	+= ksh_cv_dup2_clexec_ok=yes
-PDKSH_ENV	+= ksh_cv_dev_fd=yes ksh_cv_need_pgrp_sync=no ksh_cv_opendir_ok=yes
-
-PDKSH_ENV	+= $(CROSS_ENV)
-
-ifeq (y, $(PTXCONF_PDKSH_SHLIKE))
+PDKSH_ENV = \
+	$(CROSS_ENV) \
+	ac_cv_sizeof_long=4 \
+	ac_cv_sizeof_int=4 \
+	ac_cv_func_mmap=yes \
+	ksh_cv_func_memmove=yes \
+	ksh_cv_func_times_ok=yes \
+	ksh_cv_pgrp_check=posix \
+	ksh_cv_dup2_clexec_ok=yes \
+	ksh_cv_dev_fd=yes \
+	ksh_cv_need_pgrp_sync=no \
+	ksh_cv_opendir_ok=yes
+
+ifdef PTXCONF_PDKSH_SHLIKE
 PDKSH_AUTOCONF	+= --enable-shell=sh
 else
 PDKSH_AUTOCONF	+= --enable-shell=ksh
 endif
-ifeq (y, $(PTXCONF_PDKSH_POSIX))
+
+ifdef PTXCONF_PDKSH_POSIX
 PDKSH_AUTOCONF	+= --enable-posixly_correct
 else
 PDKSH_AUTOCONF	+= --disable-posixly_correct
 endif
-ifeq (y, $(PTXCONF_PDKSH_VI))
+
+ifdef PTXCONF_PDKSH_VI
 PDKSH_AUTOCONF	+= --enable-vi
 else
 PDKSH_AUTOCONF	+= --disable-vi
 endif
-ifeq (y, $(PTXCONF_PDKSH_EMACS))
+
+ifdef PTXCONF_PDKSH_EMACS
 PDKSH_AUTOCONF	+= --enable-emacs
 else
 PDKSH_AUTOCONF	+= --disable-emacs
 endif
-ifeq (y, $(PTXCONF_PDKSH_CMDHISTORY))
+
+ifdef PTXCONF_PDKSH_CMDHISTORY
 PDKSH_AUTOCONF	+= --enable-history=simple
 else
 PDKSH_AUTOCONF	+= --disable-history
 endif
-ifeq (y, $(PTXCONF_PDKSH_JOBS))
+
+ifdef PTXCONF_PDKSH_JOBS
 PDKSH_AUTOCONF	+= --enable-jobs
 else
 PDKSH_AUTOCONF	+= --disable-jobs
 endif
-ifeq (y, $(PTXCONF_PDKSH_BRACE_EXPAND))
+
+ifdef PTXCONF_PDKSH_BRACE_EXPAND
 PDKSH_AUTOCONF	+= --enable-brace-expand
 else
 PDKSH_AUTOCONF	+= --disable-brace-expand
@@ -111,8 +123,9 @@ endif
 #
 # dependencies
 #
-pdksh_prepare_deps =  $(STATEDIR)/pdksh.extract 
-pdksh_prepare_deps += $(STATEDIR)/virtual-xchain.install
+pdksh_prepare_deps = \
+	$(STATEDIR)/virtual-xchain.install \
+	 $(STATEDIR)/pdksh.extract 
 
 $(STATEDIR)/pdksh.prepare: $(pdksh_prepare_deps)
 	@$(call targetinfo, $@)