diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch | |
parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip |
Merge staging into master
Diffstat (limited to 'pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch')
-rw-r--r-- | pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch b/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch deleted file mode 100644 index 06d39e13ce39..000000000000 --- a/pkgs/development/tools/build-managers/gnumake/4.2/impure-dirs-head.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur a/src/read.c b/src/read.c ---- a/src/read.c 2017-11-19 15:17:47.000000000 -0500 -+++ b/src/read.c 2018-02-19 08:53:51.548755213 -0500 -@@ -109,10 +109,12 @@ - #endif - INCLUDEDIR, - #ifndef _AMIGA -+#if 0 - "/usr/gnu/include", - "/usr/local/include", - "/usr/include", - #endif -+#endif - 0 - }; - -diff -Naur a/src/remake.c b/src/remake.c ---- a/src/remake.c 2017-11-19 15:17:47.000000000 -0500 -+++ b/src/remake.c 2018-02-19 08:54:08.304101943 -0500 -@@ -1601,9 +1601,11 @@ - static const 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 |