rpms/seaview/devel seaview-chris.patch,1.2,1.3

[Christian Iseli (c4chris)]

Author: c4chris

Update of /cvs/extras/rpms/seaview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2466

Modified Files:
	seaview-chris.patch 
Log Message:
Update Makefile patch for new version.

seaview-chris.patch:

Index: seaview-chris.patch
===================================================================
RCS file: /cvs/extras/rpms/seaview/devel/seaview-chris.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seaview-chris.patch	10 Sep 2007 13:06:59 -0000	1.2
+++ seaview-chris.patch	12 Jun 2008 22:23:44 -0000	1.3
@@ -1,5 +1,6 @@
---- seaview/Makefile.chris	2007-05-07 11:08:57.000000000 +0200
-+++ seaview/Makefile	2007-05-07 11:11:44.000000000 +0200
+diff -up seaview-2.4/Makefile.chris seaview-2.4/Makefile
+--- seaview-2.4/Makefile.chris	2007-11-13 10:30:26.000000000 +0100
++++ seaview-2.4/Makefile	2008-06-13 00:12:14.000000000 +0200
 @@ -3,26 +3,27 @@
  #seaviewps  does not use the PDFLibLite library and outputs postscript 
  
@@ -19,25 +20,27 @@
  CC = gcc
  
 -OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
-+#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
-+OPT = $(RPM_OPT_FLAGS)
- 
+-
 -STDCFLAGS  = -Dunix  -c $(OPT) -I$(FLTK) -I$(X11)/include $(DEBUG) $(HELP_NOT_IN_PATH)
-+STDCFLAGS  = -Dunix  -c $(OPT) $(DEBUG) $(HELP_NOT_IN_PATH)
- 
+-
 -CFLAGS = $(STDCFLAGS) -I$(PDF)
 -PDFLIBS = -L$(PDF) -lpdf 
++#OPT = $(shell if [ '$(DEBUG)' = '' ]; then echo '-O2'; else echo '-O0'; fi)
++OPT = $(RPM_OPT_FLAGS)
++  
++STDCFLAGS  = -Dunix  -c $(OPT) $(DEBUG) $(HELP_NOT_IN_PATH)
++  
 +CFLAGS = $(STDCFLAGS) -DNO_PDF
 +#PDFLIBS = -L$(PDF) -lpdf 
  
  
  #conditional macros 
--seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF -DNO_CLUSTALW
-+#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF -DNO_CLUSTALW
+-seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF
++#seaviewps : CFLAGS = $(STDCFLAGS) -DNO_PDF
  
  
  OBJECTS = custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o viewasprots.o misc_acnuc.o
-@@ -38,8 +39,8 @@
+@@ -38,8 +39,8 @@ seaview : seaview.o $(OBJECTS) pdf.o
  
  seaviewps : seaview.o $(OBJECTS) postscript.o
  	$(CXX) $(DEBUG)  seaview.o $(OBJECTS) postscript.o \