rpms/cfitsio/devel cfitsio.spec,1.2,1.3

[Matthew D Truch (mtruch)]

Author: mtruch

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

Modified Files:
	cfitsio.spec 
Log Message:
Set lib and include directories manually since configure doesn't let one
bypass the hardcoded defaults.



Index: cfitsio.spec
===================================================================
RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfitsio.spec	13 Nov 2005 00:34:33 -0000	1.2
+++ cfitsio.spec	13 Nov 2005 17:50:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           cfitsio
 Version:        3.004
-Release:        0.8.b
+Release:        0.9.b
 Summary:        Library for manipulating FITS data files
 
 Group:          Development/Libraries
@@ -51,13 +51,18 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
+CFITSIO_LIB = %{buildroot}%{_libdir}
+CFITSIO_INCLUDE = %{buildroot}%{_includedir}/%{name}
+export CFITSIO_LIB
+export CFITSIO_INCLUDE
 make install
 #move headers to correct location (configure doesn't obey --includedir)
-mkdir -p %{buildroot}%{_includedir}/%{name}
-mv %{buildroot}%{_includedir}/*.h %{buildroot}%{_includedir}/%{name}
+mkdir -p %{buildroot}%{_libdir}
 pushd %{buildroot}%{_libdir}
 ln -s libcfitsio.so libcfitsio.so.0
 popd
+unset CFITSIO_LIB
+unset CFITSIO_INCLUDE
 
 %clean
 rm -rf %{buildroot}
@@ -76,6 +81,9 @@
 %{_libdir}/libcfitsio.a
 
 %changelog
+* Sat Nov 12 2005 Matthew Truch <matt at truch.net> - 3.004-0.9.b
+- Set libdir and includedir correctly for build process.
+
 * Sat Nov 12 2005 Matthew Truch <matt at truch.net> - 3.004-0.8.b
 - unset FC once we are done with the build