rpms/ncarg/EL-4 Site.local, 1.4, 1.5 ncarg.csh, 1.4, 1.5 ncarg.sh, 1.4, 1.5 ncarg.spec, 1.13, 1.14

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/ncarg/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30481

Modified Files:
	Site.local ncarg.csh ncarg.sh ncarg.spec 
Log Message:
Make the lib substition a bit more robust



Index: Site.local
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/Site.local,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Site.local	24 May 2007 16:33:50 -0000	1.4
+++ Site.local	24 May 2007 16:58:57 -0000	1.5
@@ -11,7 +11,7 @@
 
 #define YmakeRoot $(RPM_BUILD_ROOT)/usr
 #define ManRoot $(RPM_BUILD_ROOT)/usr/share/man
-#define LibRoot $(RPM_BUILD_ROOT)/usr/LIB/ncarg
+#define LibRoot $(RPM_BUILD_ROOT)/usr/@LIB@/ncarg
 
 
 
@@ -20,7 +20,7 @@
 #define BuildWithF90 TRUE
 #define FCompiler g77
 #define CtoFLibraries -lg2c -lm
-#define LibSearch -L/usr/LIB/hdf -L/usr/X11R6/LIB
+#define LibSearch -L/usr/@LIB@/hdf -L/usr/X11R6/@LIB@
 
 #define BuildUdunits FALSE
 #define UdUnitslib


Index: ncarg.csh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/ncarg.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncarg.csh	12 Feb 2007 23:03:55 -0000	1.4
+++ ncarg.csh	24 May 2007 16:58:57 -0000	1.5
@@ -1,2 +1,2 @@
 setenv NCARG_ROOT /usr
-setenv NCARG_LIB /usr/LIB/ncarg
+setenv NCARG_LIB /usr/@LIB@/ncarg


Index: ncarg.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/ncarg.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncarg.sh	12 Feb 2007 23:03:55 -0000	1.4
+++ ncarg.sh	24 May 2007 16:58:57 -0000	1.5
@@ -1,2 +1,2 @@
 export NCARG_ROOT=/usr
-export NCARG_LIB=/usr/LIB/ncarg
+export NCARG_LIB=/usr/@LIB@/ncarg


Index: ncarg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/ncarg.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ncarg.spec	24 May 2007 15:38:54 -0000	1.13
+++ ncarg.spec	24 May 2007 16:58:57 -0000	1.14
@@ -39,7 +39,7 @@
 cp %{SOURCE1} config
 #Fix up the lib install dir
 cp %{SOURCE2} %{SOURCE3} .
-sed -i -e s,/LIB/,/%{_lib}/, config/Site.local ncarg.csh ncarg.sh
+sed -i -e s, at LIB@,%{_lib},g config/Site.local ncarg.csh ncarg.sh
 
 
 %build