diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
| commit | 089da3ee5c25f5d36d660d6c679cb0c963617fa7 (patch) | |
| tree | c21e0b5ec1b1daa2cb08d2a9fdb460aa13d10c7f /pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch | |
| parent | db32c7ca8bf7daad6792c3e9597c68768aafd271 (diff) | |
| parent | 393dcd9c84e104ab7ff7e35f5612dc221e58d29b (diff) | |
| download | nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.gz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.bz2 nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.lz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.xz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.zst nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.zip | |
Merge master into x-updates
Conflicts (simple): pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch')
| -rw-r--r-- | pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch new file mode 100644 index 000000000000..f6646f1d0126 --- /dev/null +++ b/pkgs/development/tools/build-managers/gnumake/3.82/impure-dirs.patch @@ -0,0 +1,34 @@ +diff -rc read.c read.c +*** read.c 2006-03-17 15:24:20.000000000 +0100 +--- 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 reremake.c +*** remake.c 2006-03-20 03:36:37.000000000 +0100 +--- 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 |