gnumake: clean up directory structure; no functional change

19 files changed, 34 insertions, 0 deletions

diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
index b0926a7f531c..b0926a7f531c 100644
--- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
index fa90acfe8de5..fa90acfe8de5 100644
--- a/pkgs/development/tools/build-managers/gnumake-3.80/log.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.80/log.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/3.81.nix b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
index 56d2326c916b..56d2326c916b 100644
--- a/pkgs/development/tools/build-managers/gnumake/3.81.nix
+++ b/pkgs/development/tools/build-managers/gnumake/3.81/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
index f6646f1d0126..f6646f1d0126 100644
--- a/pkgs/development/tools/build-managers/gnumake/impure-dirs.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.81/impure-dirs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
index b98d85a08265..b98d85a08265 100644
--- a/pkgs/development/tools/build-managers/gnumake/log-3.81.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.81/log-3.81.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
index a2f59657d4ca..a2f59657d4ca 100644
--- a/pkgs/development/tools/build-managers/gnumake/MAKEFLAGS-reexec.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/MAKEFLAGS-reexec.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
index 73c0381ced45..73c0381ced45 100644
--- a/pkgs/development/tools/build-managers/gnumake/archives-many-objs.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/archives-many-objs.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
index aa4a1afe3fd0..aa4a1afe3fd0 100644
--- a/pkgs/development/tools/build-managers/gnumake/construct-command-line.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/construct-command-line.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
index 3f202b4db96b..3f202b4db96b 100644
--- a/pkgs/development/tools/build-managers/gnumake/copy-on-expand.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/copy-on-expand.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
index de7e4f615212..de7e4f615212 100644
--- a/pkgs/development/tools/build-managers/gnumake/darwin-library_search-dylib.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/darwin-library_search-dylib.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
index 4f3c7defa488..4f3c7defa488 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
index 45971f33590b..45971f33590b 100644
--- a/pkgs/development/tools/build-managers/gnumake/glob-speedup.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/glob-speedup.patch
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
diff --git a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
index 9bb7add0bde2..9bb7add0bde2 100644
--- a/pkgs/development/tools/build-managers/gnumake/intermediate-parallel.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/intermediate-parallel.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/log.patch b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
index e6197fd8e78f..e6197fd8e78f 100644
--- a/pkgs/development/tools/build-managers/gnumake/log.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/log.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
index 39ea05843bfd..39ea05843bfd 100644
--- a/pkgs/development/tools/build-managers/gnumake/long-command-line.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/long-command-line.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
index b28c07353ec2..b28c07353ec2 100644
--- a/pkgs/development/tools/build-managers/gnumake/memory-corruption.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/memory-corruption.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/oneshell.patch b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
index fbade127ce61..fbade127ce61 100644
--- a/pkgs/development/tools/build-managers/gnumake/oneshell.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/oneshell.patch
diff --git a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch
index a19fe7b7d629..a19fe7b7d629 100644
--- a/pkgs/development/tools/build-managers/gnumake/parallel-remake.patch
+++ b/pkgs/development/tools/build-managers/gnumake/3.82/parallel-remake.patch