build: Move `distro/patches' to `distro/packages/patches'.

* distro/patches: Move directory to...
* distro/packages/patches: ... here.
* Makefile.am (dist_patch_DATA): Adjust accordingly.
* pre-inst-env.in (DISTRO_PATCH_DIRECTORY): Likewise.

16 files changed, 16 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 1d3eafb6a..d1f354722 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,21 +48,21 @@ GOBJECTS = $(MODULES:%.scm=%.go)
 nobase_dist_guilemodule_DATA = $(MODULES)
 
 patchdir = $(pkgdatadir)/patches
-dist_patch_DATA =					\
-  distro/patches/binutils-ld-new-dtags.patch		\
-  distro/patches/diffutils-gets-undeclared.patch	\
-  distro/patches/guile-1.8-cpp-4.5.patch		\
-  distro/patches/guile-default-utf8.patch		\
-  distro/patches/guile-relocatable.patch		\
-  distro/patches/libtool-skip-tests.patch		\
-  distro/patches/m4-gets-undeclared.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/perl-no-sys-dirs.patch			\
-  distro/patches/readline-link-ncurses.patch		\
-  distro/patches/tar-gets-undeclared.patch
+dist_patch_DATA =						\
+  distro/packages/patches/binutils-ld-new-dtags.patch		\
+  distro/packages/patches/diffutils-gets-undeclared.patch	\
+  distro/packages/patches/guile-1.8-cpp-4.5.patch		\
+  distro/packages/patches/guile-default-utf8.patch		\
+  distro/packages/patches/guile-relocatable.patch		\
+  distro/packages/patches/libtool-skip-tests.patch		\
+  distro/packages/patches/m4-gets-undeclared.patch		\
+  distro/packages/patches/m4-readlink-EINVAL.patch		\
+  distro/packages/patches/m4-s_isdir.patch			\
+  distro/packages/patches/make-impure-dirs.patch		\
+  distro/packages/patches/findutils-absolute-paths.patch	\
+  distro/packages/patches/perl-no-sys-dirs.patch		\
+  distro/packages/patches/readline-link-ncurses.patch		\
+  distro/packages/patches/tar-gets-undeclared.patch
 
 bootstrapdir = $(pkgdatadir)/bootstrap
 bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
diff --git a/distro/patches/binutils-ld-new-dtags.patch b/distro/packages/patches/binutils-ld-new-dtags.patch
index 5f7a03fc3..5f7a03fc3 100644
--- a/distro/patches/binutils-ld-new-dtags.patch
+++ b/distro/packages/patches/binutils-ld-new-dtags.patch
diff --git a/distro/patches/diffutils-gets-undeclared.patch b/distro/packages/patches/diffutils-gets-undeclared.patch
index b6cdc77ca..b6cdc77ca 100644
--- a/distro/patches/diffutils-gets-undeclared.patch
+++ b/distro/packages/patches/diffutils-gets-undeclared.patch
diff --git a/distro/patches/findutils-absolute-paths.patch b/distro/packages/patches/findutils-absolute-paths.patch
index 96341e281..96341e281 100644
--- a/distro/patches/findutils-absolute-paths.patch
+++ b/distro/packages/patches/findutils-absolute-paths.patch
diff --git a/distro/patches/guile-1.8-cpp-4.5.patch b/distro/packages/patches/guile-1.8-cpp-4.5.patch
index 638d071ba..638d071ba 100644
--- a/distro/patches/guile-1.8-cpp-4.5.patch
+++ b/distro/packages/patches/guile-1.8-cpp-4.5.patch
diff --git a/distro/patches/guile-default-utf8.patch b/distro/packages/patches/guile-default-utf8.patch
index 409f43516..409f43516 100644
--- a/distro/patches/guile-default-utf8.patch
+++ b/distro/packages/patches/guile-default-utf8.patch
diff --git a/distro/patches/guile-relocatable.patch b/distro/packages/patches/guile-relocatable.patch
index 077394cdd..077394cdd 100644
--- a/distro/patches/guile-relocatable.patch
+++ b/distro/packages/patches/guile-relocatable.patch
diff --git a/distro/patches/libtool-skip-tests.patch b/distro/packages/patches/libtool-skip-tests.patch
index 6e12615d5..6e12615d5 100644
--- a/distro/patches/libtool-skip-tests.patch
+++ b/distro/packages/patches/libtool-skip-tests.patch
diff --git a/distro/patches/m4-gets-undeclared.patch b/distro/packages/patches/m4-gets-undeclared.patch
index d28f0cdcc..d28f0cdcc 100644
--- a/distro/patches/m4-gets-undeclared.patch
+++ b/distro/packages/patches/m4-gets-undeclared.patch
diff --git a/distro/patches/m4-readlink-EINVAL.patch b/distro/packages/patches/m4-readlink-EINVAL.patch
index dd371584a..dd371584a 100644
--- a/distro/patches/m4-readlink-EINVAL.patch
+++ b/distro/packages/patches/m4-readlink-EINVAL.patch
diff --git a/distro/patches/m4-s_isdir.patch b/distro/packages/patches/m4-s_isdir.patch
index a009a4ba4..a009a4ba4 100644
--- a/distro/patches/m4-s_isdir.patch
+++ b/distro/packages/patches/m4-s_isdir.patch
diff --git a/distro/patches/make-impure-dirs.patch b/distro/packages/patches/make-impure-dirs.patch
index 83a5fbe3a..83a5fbe3a 100644
--- a/distro/patches/make-impure-dirs.patch
+++ b/distro/packages/patches/make-impure-dirs.patch
diff --git a/distro/patches/perl-no-sys-dirs.patch b/distro/packages/patches/perl-no-sys-dirs.patch
index 3aba4d752..3aba4d752 100644
--- a/distro/patches/perl-no-sys-dirs.patch
+++ b/distro/packages/patches/perl-no-sys-dirs.patch
diff --git a/distro/patches/readline-link-ncurses.patch b/distro/packages/patches/readline-link-ncurses.patch
index 0fd0598f4..0fd0598f4 100644
--- a/distro/patches/readline-link-ncurses.patch
+++ b/distro/packages/patches/readline-link-ncurses.patch
diff --git a/distro/patches/tar-gets-undeclared.patch b/distro/packages/patches/tar-gets-undeclared.patch
index 301a09dde..301a09dde 100644
--- a/distro/patches/tar-gets-undeclared.patch
+++ b/distro/packages/patches/tar-gets-undeclared.patch
diff --git a/pre-inst-env.in b/pre-inst-env.in
index 7dcad5b96..baea6da35 100644
--- a/pre-inst-env.in
+++ b/pre-inst-env.in
@@ -23,7 +23,7 @@
 # Run COMMAND in a pre-installation environment.  Typical use is
 # "./pre-inst-env guix-build hello".
 
-DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/patches"
+DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/packages/patches"
 DISTRO_BOOTSTRAP_DIRECTORY="@abs_top_srcdir@/distro/packages/bootstrap"
 GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
 GUILE_LOAD_PATH="@abs_top_srcdir@${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"