800cdeef31
* 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'.
40 lines
1 KiB
Diff
40 lines
1 KiB
Diff
Purity: don't look for library dependencies (of the form `-lfoo') in
|
|
/lib and /usr/lib. Likewise, when searching for included Makefiles,
|
|
don't look in /usr/include and friends.
|
|
|
|
Patch from Nixpkgs, by Eelco Dolstra.
|
|
|
|
diff -rc make-3.81-orig/read.c make-3.81/read.c
|
|
*** make-3.81-orig/read.c 2006-03-17 15:24:20.000000000 +0100
|
|
--- make-3.81/read.c 2007-05-24 17:16:31.000000000 +0200
|
|
***************
|
|
*** 99,107 ****
|
|
--- 99,109 ----
|
|
#endif
|
|
INCLUDEDIR,
|
|
#ifndef _AMIGA
|
|
+ #if 0
|
|
"/usr/gnu/include",
|
|
"/usr/local/include",
|
|
"/usr/include",
|
|
+ #endif
|
|
#endif
|
|
0
|
|
};
|
|
diff -rc make-3.81-orig/remake.c make-3.81/remake.c
|
|
*** make-3.81-orig/remake.c 2006-03-20 03:36:37.000000000 +0100
|
|
--- make-3.81/remake.c 2007-05-24 17:06:54.000000000 +0200
|
|
***************
|
|
*** 1452,1460 ****
|
|
--- 1452,1462 ----
|
|
static char *dirs[] =
|
|
{
|
|
#ifndef _AMIGA
|
|
+ #if 0
|
|
"/lib",
|
|
"/usr/lib",
|
|
#endif
|
|
+ #endif
|
|
#if defined(WINDOWS32) && !defined(LIBDIR)
|
|
/*
|
|
* This is completely up to the user at product install time. Just define
|