diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-08-22 17:24:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-08-22 17:25:43 +0200 |
| commit | 800cdeef31ccc92c9f54b62ec5276985d7b157b1 (patch) | |
| tree | 81381bff713789d149aad1ebc354b42849ecebad /Makefile.am | |
| parent | af5521ca019a81d1efc4428cec242bb4f9d77a05 (diff) | |
distro: Move patches to their own directory.
* Makefile.am (nobase_dist_guilemodule_DATA): Keep only $(MODULES).
(patchdir): New variable.
(dist_patch_DATA): New variable. Patch files formerly
in $(nobase_dist_guilemodule_DATA).
(.scm.go): Define `DISTRO_PATCH_DIRECTORY' and
`DISTRO_INSTALLED_PATCH_DIRECTORY'.
(TESTS_ENVIRONMENT): Define `DISTRO_PATCH_DIRECTORY'.
* distro.scm (%patch-directory): New variable.
(search-patch): New procedure.
* distro/base.scm: Use `search-patch' instead of `(search-path
%load-path ...)'.
* distro/findutils-absolute-paths.patch, distro/guile-1.8-cpp-4.5.patch,
distro/m4-readlink-EINVAL.patch, distro/m4-s_isdir.patch,
distro/make-impure-dirs.patch: Move to `distro/patches'.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 0c05160e95..6616b80f7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,14 +35,16 @@ MODULES = \ GOBJECTS = $(MODULES:%.scm=%.go) -nobase_dist_guilemodule_DATA = \ - $(MODULES) \ - distro/guile-1.8-cpp-4.5.patch \ - distro/m4-readlink-EINVAL.patch \ - distro/m4-s_isdir.patch \ - distro/make-impure-dirs.patch \ - distro/findutils-absolute-paths.patch \ - distro/readline-link-ncurses.patch +nobase_dist_guilemodule_DATA = $(MODULES) + +patchdir = $(pkgdatadir)/patches +dist_patch_DATA = \ + distro/patches/guile-1.8-cpp-4.5.patch \ + distro/patches/m4-readlink-EINVAL.patch \ + distro/patches/m4-s_isdir.patch \ + distro/patches/make-impure-dirs.patch \ + distro/patches/findutils-absolute-paths.patch \ + distro/patches/readline-link-ncurses.patch nobase_nodist_guilemodule_DATA = $(GOBJECTS) @@ -57,6 +59,7 @@ TESTS_ENVIRONMENT = \ NIX_HASH="$(NIX_HASH)"; \ NIX_INSTANTIATE="$(NIX_INSTANTIATE)"; \ NIXPKGS="$(NIXPKGS)"; \ + DISTRO_PATCH_DIRECTORY="$(top_srcdir)/distro/patches" \ GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"; \ export NIX_HASH NIX_INSTANTIATE NIXPKGS GUILE_LOAD_COMPILED_PATH; @@ -78,6 +81,8 @@ CLEANFILES = $(GOBJECTS) *.log NIX_INSTANTIATE="$(NIX_INSTANTIATE)" \ NIXPKGS="$(NIXPKGS)" \ LIBGCRYPT="$(LIBGCRYPT)" \ + DISTRO_PATCH_DIRECTORY="$(top_srcdir)/distro/patches" \ + DISTRO_INSTALLED_PATCH_DIRECTORY="$(patchdir)" \ GUILE_AUTO_COMPILE=0 \ GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \ $(GUILD) compile -L "$(top_srcdir)" \ |