|
Matthew D Truch |
9f3ec05 |
diff -u cfitsio/configure cfitsio-new/configure
|
|
Matthew D Truch |
9f3ec05 |
--- cfitsio/configure 2005-07-28 17:26:13.000000000 -0400
|
|
Matthew D Truch |
9f3ec05 |
+++ cfitsio-new/configure 2005-11-13 14:36:39.000000000 -0500
|
|
Matthew D Truch |
9f3ec05 |
@@ -1251,7 +1251,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 |
9f3ec05 |
@@ -1271,7 +1272,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 |
9f3ec05 |
diff -u cfitsio/Makefile.in cfitsio-new/Makefile.in
|
|
Matthew D Truch |
9f3ec05 |
--- cfitsio/Makefile.in 2005-04-26 11:48:05.000000000 -0400
|
|
Matthew D Truch |
9f3ec05 |
+++ cfitsio-new/Makefile.in 2005-11-13 13:52:27.000000000 -0500
|
|
Matthew D Truch |
9f3ec05 |
@@ -19,8 +19,8 @@
|
|
Matthew D Truch |
9f3ec05 |
#
|
|
Matthew D Truch |
9f3ec05 |
|
|
Matthew D Truch |
9f3ec05 |
CFITSIO_PREFIX = @CFITSIO_PREFIX@
|
|
Matthew D Truch |
9f3ec05 |
-CFITSIO_LIB = ${CFITSIO_PREFIX}/lib
|
|
Matthew D Truch |
9f3ec05 |
-CFITSIO_INCLUDE = ${CFITSIO_PREFIX}/include
|
|
Matthew D Truch |
9f3ec05 |
+CFITSIO_LIB = ${CFITSIO_PREFIX}/${LIBDIR}
|
|
Matthew D Truch |
9f3ec05 |
+CFITSIO_INCLUDE = ${CFITSIO_PREFIX}/${INCLUDEDIR}
|
|
Matthew D Truch |
9f3ec05 |
|
|
Matthew D Truch |
9f3ec05 |
SHELL = /bin/sh
|
|
Matthew D Truch |
9f3ec05 |
RANLIB = @RANLIB@
|
|
Matthew D Truch |
9f3ec05 |
@@ -146,4 +146,4 @@
|
|
Matthew D Truch |
9f3ec05 |
objs: ${CORE_OBJECTS}
|
|
Matthew D Truch |
9f3ec05 |
|
|
Matthew D Truch |
9f3ec05 |
${CFITSIO_PREFIX} ${CFITSIO_LIB} ${CFITSIO_INCLUDE}:
|
|
Matthew D Truch |
9f3ec05 |
- @if [ ! -d $@ ]; then mkdir $@; fi
|
|
Matthew D Truch |
9f3ec05 |
+ @if [ ! -d $@ ]; then mkdir -p $@; fi
|