diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2006-03-03 10:54:04 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2006-03-03 10:54:04 +0000 |
| commit | 71155cc2dc4e6c2e57e07b8ad2cae63de2a2c879 (patch) | |
| tree | d6f206db7a5c2860934cd08848bcc29ce1ee72dd | |
| parent | d781d7e615eafe0a5ff2315606de51dce0dadfe4 (diff) | |
| download | ptxdist-71155cc2dc4e6c2e57e07b8ad2cae63de2a2c879.tar.gz ptxdist-71155cc2dc4e6c2e57e07b8ad2cae63de2a2c879.tar.xz | |
new version does cross compile, added targetinstall
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@4976 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | rules/nano.in | 5 | ||||
| -rw-r--r-- | rules/nano.make | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/rules/nano.in b/rules/nano.in index 17e69494d..a2f38d953 100644 --- a/rules/nano.in +++ b/rules/nano.in @@ -1,6 +1,6 @@ config NANO bool - depends on BROKEN + select NCURSES prompt "nano" help nano is a small, free and friendly editor which aims @@ -8,6 +8,3 @@ config NANO and feel, nano also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line number" - -comment "nano is broken, please send a patch" - depends on !BROKEN diff --git a/rules/nano.make b/rules/nano.make index 270176af0..f728150f1 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_NANO) += nano # # Paths and names # -NANO_VERSION = 1.2.4 +NANO_VERSION = 1.3.10 NANO = nano-$(NANO_VERSION) NANO_SUFFIX = tar.gz -NANO_URL = http://www.nano-editor.org/dist/v1.2/$(NANO).$(NANO_SUFFIX) +NANO_URL = http://www.nano-editor.org/dist/v1.3/$(NANO).$(NANO_SUFFIX) NANO_SOURCE = $(SRCDIR)/$(NANO).$(NANO_SUFFIX) NANO_DIR = $(BUILDDIR)/$(NANO) @@ -94,7 +94,6 @@ nano_install: $(STATEDIR)/nano.install $(STATEDIR)/nano.install: $(nano_install_deps_default) @$(call targetinfo, $@) - # FIXME: put this into targetinstall? @$(call install, NANO) @$(call touch, $@) @@ -106,6 +105,19 @@ nano_targetinstall: $(STATEDIR)/nano.targetinstall $(STATEDIR)/nano.targetinstall: $(nano_targetinstall_deps_default) @$(call targetinfo, $@) + + @$(call install_init, nano) + @$(call install_fixup,nano,PACKAGE,nano) + @$(call install_fixup,nano,PRIORITY,optional) + @$(call install_fixup,nano,VERSION,$(NANO_VERSION)) + @$(call install_fixup,nano,SECTION,base) + @$(call install_fixup,nano,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,nano,DEPENDS,) + @$(call install_fixup,nano,DESCRIPTION,missing) + + @$(call install_copy, nano, 0, 0, 0755, $(NANO_DIR)/src/nano, /usr/bin/nano) + @$(call install_finish,nano) + @$(call touch, $@) # ---------------------------------------------------------------------------- |