[gentoo-commits] gentoo-x86 commit in sci-chemistry/psipred/files: 2.6.1-Makefile.patch 2.6.1-path.patch

[gentoo-commits] gentoo-x86 commit in sci-chemistry/psipred/files: 2.6.1-Makefile.patch 2.6.1-path.patch

[Justin Lecher (jlec)]

jlec        10/02/27 10:01:54

  Added:                2.6.1-Makefile.patch 2.6.1-path.patch
  Log:
  Imported from sci overlay
  (Portage version: 2.2_rc63/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-chemistry/psipred/files/2.6.1-Makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-Makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-Makefile.patch?rev=1.1&content-type=text/plain

Index: 2.6.1-Makefile.patch
===================================================================
--- src/Makefile	2008-03-09 22:59:51.000000000 +0100
+++ src/Makefile.new	2009-04-09 12:31:38.669457918 +0200
@@ -6,9 +6,7 @@
 #### CFLAGS	Flags to pass to C compiler.
 
 INCDIR		= .
-CC		= cc
 
-CFLAGS		= -O
 LIBS		= -lm
 
 all:		psipred psipass2 seq2mtx pfilt
@@ -20,13 +18,13 @@
 		/bin/rm -f psipred psipass2 seq2mtx pfilt
 
 psipred:	sspred_avpred.c ssdefs.h sspred_net.h
-		$(CC) $(CFLAGS) sspred_avpred.c $(LIBS) -o psipred
+		$(CC) $(CFLAGS) $(LDFLAGS) sspred_avpred.c $(LIBS) -o psipred
 
 psipass2:	sspred_hmulti.c ssdefs.h sspred_net2.h
-		$(CC) $(CFLAGS) sspred_hmulti.c $(LIBS) -o psipass2
+		$(CC) $(CFLAGS) $(LDFLAGS) sspred_hmulti.c $(LIBS) -o psipass2
 
 seq2mtx:	seq2mtx.c
-		$(CC) $(CFLAGS) seq2mtx.c $(LIBS) -o seq2mtx
+		$(CC) $(CFLAGS) $(LDFLAGS) seq2mtx.c $(LIBS) -o seq2mtx
 
 pfilt:		pfilt.c
-		$(CC) $(CFLAGS) pfilt.c $(LIBS) -o pfilt
+		$(CC) $(CFLAGS) $(LDFLAGS) pfilt.c $(LIBS) -o pfilt
--- src/Makefile	2009-04-09 12:34:41.636939862 +0200
+++ src/Makefile.new	2009-04-09 12:36:03.796098341 +0200
@@ -12,7 +12,8 @@
 all:		psipred psipass2 seq2mtx pfilt
 
 install:
-		/bin/cp psipred psipass2 seq2mtx pfilt ../bin
+		/bin/mkdir -p $(DESTDIR)/usr/bin
+		/bin/cp psipred psipass2 seq2mtx pfilt $(DESTDIR)/usr/bin
 
 clean:
 		/bin/rm -f psipred psipass2 seq2mtx pfilt



1.1                  sci-chemistry/psipred/files/2.6.1-path.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/psipred/files/2.6.1-path.patch?rev=1.1&content-type=text/plain

Index: 2.6.1-path.patch
===================================================================
--- runpsipred	2008-04-05 00:14:36.000000000 +0200
+++ runpsipred.new	2009-04-09 12:40:46.376203036 +0200
@@ -14,13 +14,13 @@
 set dbname = nr
 
 # Where the NCBI programs have been installed
-set ncbidir = /usr/local/bin
+set ncbidir = @GENTOO_PORTAGE_EPREFIX@/usr/bin
 
 # Where the PSIPRED V2 programs have been installed
-set execdir = ./bin
+set execdir = @GENTOO_PORTAGE_EPREFIX@/usr/bin
 
 # Where the PSIPRED V2 data files have been installed
-set datadir = ./data
+set datadir = @GENTOO_PORTAGE_EPREFIX@/usr/share/psipred/data
 
 set basename = $1:r
 set rootname = $basename:t
--- runpsipred_single	2008-04-05 00:14:38.000000000 +0200
+++ runpsipred_single.new	2009-04-09 12:41:10.086067082 +0200
@@ -10,10 +10,10 @@
 # NOTE: Script modified to be more cluster friendly (DTJ April 2008)
 
 # Where the PSIPRED V2 programs have been installed
-set execdir = ./bin
+set execdir = @GENTOO_PORTAGE_EPREFIX@/usr/bin
 
 # Where the PSIPRED V2 data files have been installed
-set datadir = ./data
+set datadir = @GENTOO_PORTAGE_EPREFIX@/usr/share/psipred/data
 
 set basename = $1:r
 set rootname = $basename:t