diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-02 11:34:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-10-28 11:35:56 +0200 |
| commit | 9333a284047a6c5551fdd1bff006fd51b3948422 (patch) | |
| tree | d5f59895099ab6e57d22cd662d9ad37b4101d543 | |
| parent | bf46911deb9c5ced647a006dff8fa2d9bb08f409 (diff) | |
| download | ptxdist-9333a284047a6c5551fdd1bff006fd51b3948422.tar.gz ptxdist-9333a284047a6c5551fdd1bff006fd51b3948422.tar.xz | |
[rules] define and use PTXDIST_PATH_(PRE|POST)RULES
Don't explicitly use workspace and ptxdist rules dirs when including
pre and post makefiles. Use a path variable instead.
It's now possible to add pre and post makefiles in the platform.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/other/Toplevel.make | 6 | ||||
| -rw-r--r-- | scripts/lib/ptxd_lib_00-init.sh | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 1d6692731..6f1616bac 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -37,10 +37,9 @@ endif include $(PTX_MAP_ALL_MAKE) include $(RULESDIR)/other/Namespace.make -include $(wildcard $(PRERULESDIR)/*.make) # might be non existent -include $(wildcard $(PROJECTPRERULESDIR)/*.make) +include $(wildcard $(addsuffix /*.make,$(subst :,$(space),$(PTXDIST_PATH_PRERULES)))) include $(PTX_DGEN_DEPS_PRE) include $(PTX_DGEN_RULESFILES_MAKE) @@ -96,8 +95,7 @@ PTX_PACKAGES_INSTALL := \ $(PACKAGES-b) # might be non existent -include $(wildcard $(POSTRULESDIR)/*.make) -include $(wildcard $(PROJECTPOSTRULESDIR)/*.make) +include $(wildcard $(addsuffix /*.make,$(subst :,$(space),$(PTXDIST_PATH_POSTRULES)))) # install_alternative and install_copy has some configuration defined # dependencies. include the files specifying these dependencies. include $(wildcard $(STATEDIR)/*.deps) diff --git a/scripts/lib/ptxd_lib_00-init.sh b/scripts/lib/ptxd_lib_00-init.sh index 42d982be0..17912969f 100644 --- a/scripts/lib/ptxd_lib_00-init.sh +++ b/scripts/lib/ptxd_lib_00-init.sh @@ -92,6 +92,12 @@ ptxd_init_ptxdist_path() { PTXDIST_PATH_RULES="${PTXDIST_PATH//://rules:}" export PTXDIST_PATH_RULES + PTXDIST_PATH_PRERULES="${PTXDIST_PATH_RULES//://pre:}" + export PTXDIST_PATH_PRERULES + + PTXDIST_PATH_POSTRULES="${PTXDIST_PATH_RULES//://post:}" + export PTXDIST_PATH_POSTRULES + ptxd_init_ptxdist_path_sysroot } |