diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-05 22:48:06 +0000 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-05 22:48:06 +0000 |
commit | d8b635713f7e4134543a5a7f3b8ed3dbae9c2495 (patch) | |
tree | add3a953f52f1d0c2fab3c627a4200ef740eca0f | |
parent | fa42accd367ffcd4ad05c19cd9bbb622de020485 (diff) | |
download | ptxdist-d8b635713f7e4134543a5a7f3b8ed3dbae9c2495.tar.gz ptxdist-d8b635713f7e4134543a5a7f3b8ed3dbae9c2495.tar.xz |
[bing] cleanups, add destdir support to makefile
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10235 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r-- | patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff | 9 | ||||
-rw-r--r-- | rules/bing.make | 18 |
2 files changed, 12 insertions, 15 deletions
diff --git a/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff b/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff index e2198449f..cb25b4b04 100644 --- a/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff +++ b/patches/bing_src-1.1.3/generic/adapt_makefile_for_linux.diff @@ -1,6 +1,9 @@ -Adapt makefile for Linux +From: Wolfram Sang <w.sang@pengutronix.de> +From: Marc Kleine-Budde <mkl@pengutronix.de> +Subject: Adapt makefile for Linux, add destdir support Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- # 20081124: wsa: there is no upstream anymore :( @@ -57,5 +60,5 @@ Index: Makefile install: bing unix/bing.8 - $(INSTALL) -m 644 -o man -g man unix/bing.8 $(MANDIR)/man8 - $(INSTALL) -m 4555 -o root -g staff bing $(BINDIR) -+ $(INSTALL) -m 644 unix/bing.8 $(MANDIR)/man8 -+ $(INSTALL) -m 4555 -o root bing $(BINDIR) ++ $(INSTALL) -m 644 unix/bing.8 $(DESTDIR)$(MANDIR)/man8 ++ $(INSTALL) -m 4555 -o root bing $(DESTDIR)$(BINDIR) diff --git a/rules/bing.make b/rules/bing.make index 14555dee2..f818e2ee5 100644 --- a/rules/bing.make +++ b/rules/bing.make @@ -3,6 +3,7 @@ # # Copyright (C) 2003 by Robert Schwebel # Copyright (C) 2008 by Wolfram Sang, Pengutronix e.K. +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -39,19 +40,12 @@ $(BING_SOURCE): # ---------------------------------------------------------------------------- BING_PATH := PATH=$(CROSS_PATH) -BING_ENV := $(CROSS_ENV) PREFIX=$(SYSROOT)/usr +BING_ENV := $(CROSS_ENV) -$(STATEDIR)/bing.prepare: - @$(call targetinfo) - @$(call touch) +BING_MAKEVARS := $(CROSS_ENV_CC) -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/bing.compile: +$(STATEDIR)/bing.prepare: @$(call targetinfo) - cd $(BING_DIR) && $(BING_ENV) $(BING_PATH) $(MAKE) @$(call touch) # ---------------------------------------------------------------------------- @@ -66,10 +60,10 @@ $(STATEDIR)/bing.targetinstall: @$(call install_fixup, bing,PRIORITY,optional) @$(call install_fixup, bing,VERSION,$(BING_VERSION)) @$(call install_fixup, bing,SECTION,base) - @$(call install_fixup, bing,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, bing,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, bing,DEPENDS,) @$(call install_fixup, bing,DESCRIPTION,missing) - @$(call install_copy, bing, 0, 0, 0755, $(BING_DIR)/bing, /usr/sbin/bing) + @$(call install_copy, bing, 0, 0, 0755, -, /usr/sbin/bing) @$(call install_finish, bing) @$(call touch) |