diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-02-07 14:20:46 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-02-07 14:20:46 +0000 |
| commit | 6f573eb5dedb0625d1df9a6fdf9839bcaa9cba8e (patch) | |
| tree | 0e231893525f4db5d4672044fdfdb650722ccfb5 /rules | |
| parent | c21f0768fcaa95720e22ed5d7814b398645f6c17 (diff) | |
| download | haskell-6f573eb5dedb0625d1df9a6fdf9839bcaa9cba8e.tar.gz | |
Call the final build system phase "final" rather than ""
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package.mk | 4 | ||||
| -rw-r--r-- | rules/build-prog.mk | 4 | ||||
| -rw-r--r-- | rules/docbook.mk | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/rules/build-package.mk b/rules/build-package.mk index 74ffbbd925..ac0a8eebce 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3) ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifeq "$3" "0" include $1/$2/package-data.mk -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" include $1/$2/package-data.mk endif endif @@ -109,7 +109,7 @@ ifneq "$(phase)" "0" # bootstrapping stuff ifeq "$3" "0" $(call include-dependencies,$1,$2,$3) -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" # In the final phase, we also include the dependency files for # everything else $(call include-dependencies,$1,$2,$3) diff --git a/rules/build-prog.mk b/rules/build-prog.mk index c08c40828a..5c352a2f95 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -82,7 +82,7 @@ $(call build-package-data,$1,$2,$3) ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" ifeq "$3" "0" include $1/$2/package-data.mk -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" include $1/$2/package-data.mk endif endif @@ -197,7 +197,7 @@ ifneq "$(phase)" "0" # bootstrapping stuff ifeq "$3" "0" $(call include-dependencies,$1,$2,$3) -else ifeq "$(phase)" "" +else ifeq "$(phase)" "final" # In the final phase, we also include the dependency files for # everything else $(call include-dependencies,$1,$2,$3) diff --git a/rules/docbook.mk b/rules/docbook.mk index 8030fb7dc8..5a7bfdfd83 100644 --- a/rules/docbook.mk +++ b/rules/docbook.mk @@ -26,7 +26,7 @@ $(call all-target,$1,) .PHONY: html_$1 -ifeq "$$(phase)" "" +ifeq "$$(phase)" "final" ifeq "$$(BUILD_DOCBOOK_HTML)" "YES" $(call all-target,$1,html_$1) INSTALL_HTML_DOC_DIRS += $1/$2 @@ -50,7 +50,7 @@ endif .PHONY: ps_$1 -ifeq "$$(phase)" "" +ifeq "$$(phase)" "final" ifeq "$$(BUILD_DOCBOOK_PS)" "YES" $(call all-target,$1,ps_$1) INSTALL_DOCS += $1/$2.ps @@ -65,7 +65,7 @@ $1/$2.ps: $$($1_DOCBOOK_SOURCES) [ -f $$@ ] endif -ifeq "$$(phase)" "" +ifeq "$$(phase)" "final" ifeq "$$(BUILD_DOCBOOK_PDF)" "YES" $(call all-target,$1,pdf_$1) INSTALL_DOCS += $1/$2.pdf |