diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
| commit | 8c5533b582bc3fe1293469771d1a326926e84586 (patch) | |
| tree | 7f71c4dd85489139a11897ee2668e26acdaf40b0 /gnu/packages/patches | |
| parent | 2b0c755d195c79bfc95cdbe802e1e2dea1adb7a2 (diff) | |
| parent | 41ce92501b53caa1dcf89fa81aed71dbf1f85d34 (diff) | |
| download | gnu-guix-8c5533b582bc3fe1293469771d1a326926e84586.tar gnu-guix-8c5533b582bc3fe1293469771d1a326926e84586.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/blast+-fix-makefile.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gnu/packages/patches/blast+-fix-makefile.patch b/gnu/packages/patches/blast+-fix-makefile.patch deleted file mode 100644 index bfa46a7e51..0000000000 --- a/gnu/packages/patches/blast+-fix-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -Without this patch, the 'make install' attempts to 'install' a directory, which causes an error. - -diff --git a/c++/src/build-system/Makefile.in.top b/c++/src/build-system/Makefile.in.top -index 1abe44f..d6000b3 100644 ---- a/c++/src/build-system/Makefile.in.top -+++ b/c++/src/build-system/Makefile.in.top -@@ -51,7 +51,7 @@ install-toolkit: - done - cd $(includedir0) && find * -name CVS -prune -o -print |\ - cpio -pd $(pincludedir) -- $(INSTALL) -m 644 $(incdir)/* $(pincludedir) -+ cp -R $(incdir)/* $(pincludedir) - ## set up appropriate build and status directories somewhere under $(libdir)? - - install-gbench: |