Matthew D Truch a8598dd
diff -ur cfitsio/configure cfitsio-fixed/configure
Matthew D Truch a8598dd
--- cfitsio/configure	2011-01-10 12:03:51.000000000 -0500
Matthew D Truch a8598dd
+++ cfitsio-fixed/configure	2011-04-11 11:33:54.384980620 -0400
Matthew D Truch a8598dd
@@ -3778,7 +3778,8 @@
Matthew D Truch 9f3ec05
     SHLIB_SUFFIX=".sl"
Matthew D Truch 9f3ec05
     ;;
Matthew D Truch 9f3ec05
   lnx)
Matthew D Truch 9f3ec05
-    SHLIB_LD=":"
Matthew D Truch 9f3ec05
+    SHLIB_LD="cc -shared -Wl,-soname,libcfitsio.so.0"
Matthew D Truch 9f3ec05
+    SHLIB_SUFFIX=".so.0"
Matthew D Truch 9f3ec05
     ;;
Matthew D Truch 9f3ec05
   osf)
Matthew D Truch 9f3ec05
     SHLIB_LD="ld -shared -expect_unresolved '*'"
Matthew D Truch a8598dd
@@ -3799,7 +3800,7 @@
Matthew D Truch 9f3ec05
 # Darwin uses gcc (=cc), but needs different flags (see above)
Matthew D Truch 9f3ec05
 # if test "x$GCC" = xyes; then
Matthew D Truch 9f3ec05
 if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
Matthew D Truch 9f3ec05
-  SHLIB_LD="$CC -shared"
Matthew D Truch 9f3ec05
+  SHLIB_LD="cc -shared -Wl,-soname,libcfitsio.so.0"
Matthew D Truch 9f3ec05
   lhea_shlib_cflags='-fPIC'
Matthew D Truch 9f3ec05
 fi
Matthew D Truch 9f3ec05
 if test "x$lhea_shlib_cflags" != x; then
Matthew D Truch a8598dd
diff -ur cfitsio/Makefile.in cfitsio-fixed/Makefile.in
Matthew D Truch a8598dd
--- cfitsio/Makefile.in	2011-01-10 12:04:46.000000000 -0500
Matthew D Truch a8598dd
+++ cfitsio-fixed/Makefile.in	2011-04-11 11:33:54.385980894 -0400
Matthew D Truch 42a592b
@@ -22,8 +22,8 @@
Matthew D Truch 4b40cfa
 exec_prefix	= @exec_prefix@
Matthew D Truch 42a592b
 DESTDIR		= 
Matthew D Truch 4b40cfa
 CFITSIO_PREFIX	= $(prefix)
Matthew D Truch 42a592b
-CFITSIO_LIB	= $(DESTDIR)$(exec_prefix)/lib
Matthew D Truch 42a592b
-CFITSIO_INCLUDE	= $(DESTDIR)$(prefix)/include
Matthew D Truch 42a592b
+CFITSIO_LIB	= $(DESTDIR)$(exec_prefix)/$(LIBDIR)
Matthew D Truch 42a592b
+CFITSIO_INCLUDE	= $(DESTDIR)$(prefix)/$(INCLUDEDIR)
Matthew D Truch 42a592b
 INSTALL_DIRS	= $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}
Matthew D Truch 4b40cfa
 
Matthew D Truch 4b40cfa