diff options
| -rw-r--r-- | rules/dosfstools.make | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/rules/dosfstools.make b/rules/dosfstools.make index 3194b6a99..bb55e7d9a 100644 --- a/rules/dosfstools.make +++ b/rules/dosfstools.make @@ -2,6 +2,7 @@ # $Id: template 2606 2005-05-10 21:49:41Z rsc $ # # Copyright (C) 2005 by Steven Scholz <steven.scholz@imc-berlin.de> +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -40,29 +41,13 @@ $(DOSFSTOOLS_SOURCE): DOSFSTOOLS_PATH := PATH=$(CROSS_PATH) DOSFSTOOLS_ENV := $(CROSS_ENV) -DOSFSTOOLS_MAKEVARS := PREFIX=/ -$(STATEDIR)/dosfstools.prepare: - @$(call targetinfo) - @$(call touch) +DOSFSTOOLS_MAKEVARS := \ + PREFIX=/ \ + $(CROSS_ENV_CC) -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/dosfstools.compile: - @$(call targetinfo) - cd $(DOSFSTOOLS_DIR) && $(DOSFSTOOLS_ENV) $(DOSFSTOOLS_PATH) \ - make CC=$(COMPILER_PREFIX)gcc - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/dosfstools.install: +$(STATEDIR)/dosfstools.prepare: @$(call targetinfo) - @$(call install, DOSFSTOOLS) @$(call touch) # ---------------------------------------------------------------------------- @@ -77,29 +62,31 @@ $(STATEDIR)/dosfstools.targetinstall: @$(call install_fixup, dosfstools,PRIORITY,optional) @$(call install_fixup, dosfstools,VERSION,$(DOSFSTOOLS_VERSION)) @$(call install_fixup, dosfstools,SECTION,base) - @$(call install_fixup, dosfstools,AUTHOR,"Steven Scholz <steven.scholz\@imc-berlin.de>") + @$(call install_fixup, dosfstools,AUTHOR,"Steven Scholz <steven.scholz@imc-berlin.de>") @$(call install_fixup, dosfstools,DEPENDS,) @$(call install_fixup, dosfstools,DESCRIPTION,missing) ifdef PTXCONF_DOSFSTOOLS_MKDOSFS - @$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/mkdosfs, /sbin/mkdosfs) + @$(call install_copy, dosfstools, 0, 0, 0755, -, \ + /sbin/mkdosfs) endif ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_MSDOS - @$(call install_link, dosfstools, /sbin/mkdosfs, /sbin/mkfs.msdos) + @$(call install_link, dosfstools, mkdosfs, /sbin/mkfs.msdos) endif ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_VFAT - @$(call install_link, dosfstools, /sbin/mkdosfs, /sbin/mkfs.vfat) + @$(call install_link, dosfstools, mkdosfs, /sbin/mkfs.vfat) endif ifdef PTXCONF_DOSFSTOOLS_DOSFSCK - @$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/dosfsck, /sbin/dosfsck) + @$(call install_copy, dosfstools, 0, 0, 0755, -, \ + /sbin/dosfsck) endif ifdef PTXCONF_DOSFSTOOLS_DOSFSCK_MSDOS - @$(call install_link, dosfstools, /sbin/dosfsck, /sbin/fsck.msdos) + @$(call install_link, dosfstools, dosfsck, /sbin/fsck.msdos) endif ifdef PTXCONF_DOSFSTOOLS_DOSFSCK_VFAT - @$(call install_link, dosfstools, /sbin/dosfsck, /sbin/fsck.vfat) + @$(call install_link, dosfstools, dosfsck, /sbin/fsck.vfat) endif @$(call install_finish, dosfstools) |