From 033b0ac615c372959e7171b89f49c0163969b048 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 17 Jan 2013 22:37:37 +0100 Subject: [PATCH 1/2] fix patch --- .../NCBI-Toolkit_make-install-fix.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch index 6729e31cd0a4..62a17ad18671 100644 --- a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch +++ b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch @@ -7,20 +7,20 @@ diff -ru ncbi_cxx--9_0_0.orig/src/build-system/Makefile.in.top ncbi_cxx--9_0_0/s $(INSTALL) -d $(bindir) $(libdir) $(pincludedir) $(INSTALL) $(lbindir)/* $(bindir) - $(INSTALL) -m 644 $(llibdir)/* $(libdir) -+ cd $(llibdir) -+ for l in `find . -type f`; do  $(INSTALL) -m 644 "$$l" $(libdir); done ++ cd $(llibdir) && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir); done + mkdir $(libdir)/ncbi + mkdir $(libdir)/ncbi/mod + mkdir $(libdir)/schemas + mkdir $(libdir)/wmod -+ cd $(llibdir)/ncbi -+ for l in `find . -type f`; do  $(INSTALL) -m 644 "$$l" $(libdir)/ncbi; done -+ cd $(llibdir)/ncbi/mod -+ for l in `find . -type f`; do  $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/mod; done -+ cd  $(llibdir)/ncbi/schemas -+ for l in `find . -type f`; do  $(INSTALL) -m 644 "$$l" $(libdir)/schemas; done -+ cd  $(llibdir)/ncbi/wmod -+ for l in `find . -type f`; do  $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/wmod; done ++ cd $(llibdir)/ncbi && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi; done ++ cd $(llibdir)/ncbi/mod && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/mod; done ++ cd  $(llibdir)/ncbi/schemas && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/schemas; done ++ cd  $(llibdir)/ncbi/wmod && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/wmod; done -rm -f $(libdir)/lib*-static.a cd $(libdir) && \ for x in *.a; do ln -s "$$x" "`basename \"$$x\" .a`-static.a"; done From 35bce57f500bc82c02cfce6d8b826c4b83be1c5c Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 17 Jan 2013 22:55:52 +0100 Subject: [PATCH 2/2] really fix patch --- .../NCBI-Toolkit_make-install-fix.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch index 62a17ad18671..29a7e5867223 100644 --- a/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch +++ b/easybuild/easyconfigs/n/NCBI-Toolkit/NCBI-Toolkit_make-install-fix.patch @@ -7,20 +7,20 @@ diff -ru ncbi_cxx--9_0_0.orig/src/build-system/Makefile.in.top ncbi_cxx--9_0_0/s $(INSTALL) -d $(bindir) $(libdir) $(pincludedir) $(INSTALL) $(lbindir)/* $(bindir) - $(INSTALL) -m 644 $(llibdir)/* $(libdir) -+ cd $(llibdir) && \ -+ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir); done ++ cd $(llibdir) && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir); done + mkdir $(libdir)/ncbi + mkdir $(libdir)/ncbi/mod + mkdir $(libdir)/schemas + mkdir $(libdir)/wmod -+ cd $(llibdir)/ncbi && \ -+ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi; done -+ cd $(llibdir)/ncbi/mod && \ -+ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/mod; done -+ cd  $(llibdir)/ncbi/schemas && \ -+ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/schemas; done -+ cd  $(llibdir)/ncbi/wmod && \ -+ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/wmod; done ++ cd $(llibdir)/ncbi && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi; done ++ cd $(llibdir)/ncbi/mod && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/mod; done ++ cd $(llibdir)/ncbi/schemas && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/schemas; done ++ cd $(llibdir)/ncbi/wmod && \ ++ for l in `find . -type f`; do $(INSTALL) -m 644 "$$l" $(libdir)/ncbi/wmod; done -rm -f $(libdir)/lib*-static.a cd $(libdir) && \ for x in *.a; do ln -s "$$x" "`basename \"$$x\" .a`-static.a"; done