diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-11-30 10:36:47 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-11-30 10:39:32 +0100 |
| commit | 23ec30258a17884d8ccee943c13187ab701eeff3 (patch) | |
| tree | fd0d453260f743c613ff9e6336862bb9ca258aa7 /rules/latrace.make | |
| parent | 8182ef009e9a54c59a281696ac488afc0577a7af (diff) | |
| download | ptxdist-23ec30258a17884d8ccee943c13187ab701eeff3.tar.gz ptxdist-23ec30258a17884d8ccee943c13187ab701eeff3.tar.xz | |
latrace: make sure no docs are generated & other cleanup
Otherwise, building fails is xmlto is found but asciidoc is not.
Also, make sure the architecture is correctly selected for more
architectures. Remove redundant directory creation.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/latrace.make')
| -rw-r--r-- | rules/latrace.make | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/rules/latrace.make b/rules/latrace.make index bfd402afb..8f08116a3 100644 --- a/rules/latrace.make +++ b/rules/latrace.make @@ -29,15 +29,16 @@ LATRACE_LICENSE := GPL-3.0 # Prepare # ---------------------------------------------------------------------------- -ifdef PTXCONF_ARCH_X86 -LATRACE_ARCH := i686 -endif -ifdef PTXCONF_ARCH_ARM -LATRACE_ARCH := arm +LATRACE_ARCH := $(PTXCONF_ARCH_STRING) +ifeq ($(PTXCONF_ARCH_X86)-$(PTXCONF_ARCH_X86_64),y-) +LATRACE_ARCH := "i686" endif -LATRACE_ENV := $(CROSS_ENV) \ - latrace_arch=$(LATRACE_ARCH) +LATRACE_CONF_ENV := \ + $(CROSS_ENV) \ + latrace_arch=$(LATRACE_ARCH) \ + ac_cv_path_ASCIIDOC=: \ + ac_cv_path_XMLTO=: # # autoconf # @@ -59,8 +60,6 @@ $(STATEDIR)/latrace.targetinstall: @$(call install_fixup, latrace,AUTHOR,"Juergen Borleis <jbe@pengutronix.de>") @$(call install_fixup, latrace,DESCRIPTION,"library call tracer") - @$(call install_copy, latrace, 0, 0, 0755, /etc/latrace.d) - @$(call install_copy, latrace, 0, 0, 0755, /etc/latrace.d/headers) @$(call install_alternative, latrace, 0, 0, 0644, /etc/latrace.d/latrace.conf) @$(call install_tree, latrace, 0, 0, -, /etc/latrace.d/headers/) |