* less.make:

	install from LESS_DIR not from SYSROOT
	cleanup


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

1 files changed, 21 insertions, 75 deletions

diff --git a/rules/less.make b/rules/less.make
index 7ece19e45..90a086834 100644
--- a/rules/less.make
+++ b/rules/less.make
@@ -17,46 +17,25 @@ PACKAGES-$(PTXCONF_LESS) += less
 #
 # Paths and names
 #
-LESS_VERSION		:= 418
-LESS			:= less-$(LESS_VERSION)
-LESS_SUFFIX		:= tar.gz
-LESS_URL		:= ftp://ftp.sunfreeware.com/pub/freeware/SOURCES/$(LESS).$(LESS_SUFFIX)
-LESS_SOURCE		:= $(SRCDIR)/$(LESS).$(LESS_SUFFIX)
-LESS_DIR		:= $(BUILDDIR)/$(LESS)
+LESS_VERSION	:= 418
+LESS		:= less-$(LESS_VERSION)
+LESS_SUFFIX	:= tar.gz
+LESS_URL	:= $(PTXCONF_SETUP_GNUMIRROR)/less/$(LESS).$(LESS_SUFFIX)
+LESS_SOURCE	:= $(SRCDIR)/$(LESS).$(LESS_SUFFIX)
+LESS_DIR	:= $(BUILDDIR)/$(LESS)
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-less_get: $(STATEDIR)/less.get
-
-$(STATEDIR)/less.get: $(less_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(LESS_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, LESS)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-less_extract: $(STATEDIR)/less.extract
-
-$(STATEDIR)/less.extract: $(less_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(LESS_DIR))
-	@$(call extract, LESS)
-	@$(call patchin, LESS)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-less_prepare: $(STATEDIR)/less.prepare
-
 LESS_PATH	:= PATH=$(CROSS_PATH)
 LESS_ENV 	:= $(CROSS_ENV)
 
@@ -70,85 +49,61 @@ LESS_ENV += ac_cv_lib_PW_regcmp=yes
 else
 LESS_ENV += ac_cv_lib_PW_regcmp=no
 endif
+
 ifdef PTXCONF_LESS_USE_CURSES
 LESS_ENV += ac_cv_lib_curses_initscr=yes
 else
 LESS_ENV += ac_cv_lib_curses_initscr=no
 endif
+
 ifdef PTXCONF_LESS_USE_TINFO
 LESS_ENV += ac_cv_lib_tinfo_tgoto=yes
 else
 LESS_ENV += ac_cv_lib_tinfo_tgoto=no
 endif
+
 ifdef PTXCONF_LESS_USE_XCURSES
 LESS_ENV += ac_cv_lib_xcurses_initscr=yes
 else
 LESS_ENV += ac_cv_lib_xcurses_initscr=no
 endif
+
 ifdef PTXCONF_LESS_USE_NCURSES
 LESS_ENV += ac_cv_lib_ncurses_initscr=yes
 else
 LESS_ENV += ac_cv_lib_ncurses_initscr=no
 endif
+
 ifdef PTXCONF_LESS_USE_TERMCAP
 LESS_ENV += ac_cv_lib_termcap_tgetent=yes
 else
 LESS_ENV += ac_cv_lib_termcap_tgetent=no
 endif
+
 ifdef PTXCONF_LESS_USE_TERMLIB
 LESS_ENV += ac_cv_lib_termlib_tgetent=yes
 else
 LESS_ENV += ac_cv_lib_termlib_tgetent=no
 endif
+
 ifdef PTXCONF_LESS_USE_GEN
 LESS_ENV += ac_cv_lib_gen_regcmp=yes
 else
 LESS_ENV += ac_cv_lib_gen_regcmp=no
 endif
+
 ifdef PTXCONF_LESS_USE_INTL
 LESS_ENV += ac_cv_lib_intl_regcmp=yes
 else
 LESS_ENV += ac_cv_lib_intl_regcmp=no
 endif
 
-$(STATEDIR)/less.prepare: $(less_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(LESS_DIR)/config.cache)
-	cd $(LESS_DIR) && \
-		$(LESS_PATH) $(LESS_ENV) \
-		./configure $(LESS_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-less_compile: $(STATEDIR)/less.compile
-
-$(STATEDIR)/less.compile: $(less_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(LESS_DIR) && $(LESS_PATH) $(MAKE) $(PARALLELMFLAGS)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-less_install: $(STATEDIR)/less.install
-
-$(STATEDIR)/less.install: $(less_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call install, LESS)
-	@$(call touch, $@)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-less_targetinstall: $(STATEDIR)/less.targetinstall
-
-$(STATEDIR)/less.targetinstall: $(less_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/less.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, less)
 	@$(call install_fixup, less,PACKAGE,less)
@@ -159,30 +114,21 @@ $(STATEDIR)/less.targetinstall: $(less_targetinstall_deps_default)
 	@$(call install_fixup, less,DEPENDS,)
 	@$(call install_fixup, less,DESCRIPTION,missing)
 
-	@echo "DEBUG"
-	@echo "SYSROOT: $(SYSROOT) $(LESS)"
-	@echo ""
-
-#
-# FIXME: copy from $(SYSROOT is probably a bad idea, better would be something like
-#        (...)/local/packages/less-406/... identified as e.g. $(PACKAGE_SYSROOT)
-#	 or $(LESS_SYSROOT).						bbu, 20071018
-#
 ifdef PTXCONF_LESS_BIN
-	@$(call install_copy, less, 0, 0, 0755, $(SYSROOT)/usr/bin/less, /usr/bin/less)
+	@$(call install_copy, less, 0, 0, 0755, $(LESS_DIR)/less, /usr/bin/less)
 endif
 
 ifdef PTXCONF_LESS_KEY
-	@$(call install_copy, less, 0, 0, 0755, $(SYSROOT)/usr/bin/lesskey, /usr/bin/lesskey)
+	@$(call install_copy, less, 0, 0, 0755, $(LESS_DIR)/lesskey, /usr/bin/lesskey)
 endif
 
 ifdef PTXCONF_LESS_ECHO
-	@$(call install_copy, less, 0, 0, 0755, $(SYSROOT)/usr/bin/lessecho, /usr/bin/lessecho)
+	@$(call install_copy, less, 0, 0, 0755, $(LESS_DIR)/lessecho, /usr/bin/lessecho)
 endif
 
 	@$(call install_finish, less)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean