diff -ur funtools-1.3.0b29/filter/Makefile.in funtools-1.3.0b29.new/filter/Makefile.in
--- funtools-1.3.0b29/filter/Makefile.in 2006-03-20 19:42:11.000000000 +0100
+++ funtools-1.3.0b29.new/filter/Makefile.in 2007-03-26 10:47:02.000000000 +0200
@@ -29,6 +29,25 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+host_alias = @host_alias@
+includedir = @includedir@
+nfodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
@@ -38,13 +57,13 @@
INSTALL_ROOT =
# Directory in which to install the .a, .so, and .o files:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the programs:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include files:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filt
# util files are in the util directory at same level
UTIL_INC = -I../util
@@ -55,7 +74,7 @@
#FITSY_LIBS = -L../fitsy
# wcs files are in the wcs subdirectory
-WCS_INC = -I../wcs
+WCS_INC = -I/usr/include/wcs
#WCS_LIBS = -L../wcs -lwcs
# extra includes for compiling
@@ -161,7 +180,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
- mkdir $$i; \
+ mkdir -p $$i; \
chmod 755 $$i; \
else true; \
fi; \
diff -ur funtools-1.3.0b29/fitsy/Makefile.in funtools-1.3.0b29.new/fitsy/Makefile.in
--- funtools-1.3.0b29/fitsy/Makefile.in 2006-10-30 17:51:58.000000000 +0100
+++ funtools-1.3.0b29.new/fitsy/Makefile.in 2007-03-26 10:47:02.000000000 +0200
@@ -28,6 +28,25 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+host_alias = @host_alias@
+includedir = @includedir@
+nfodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
@@ -37,13 +56,13 @@
INSTALL_ROOT =
# Directory in which to install the .a, .so, and .o files:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the programs:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include files:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy
# There are just too many different versions of "install" around;
# better to use the install-sh script that comes with the distribution,
diff -ur funtools-1.3.0b29/Makefile.in funtools-1.3.0b29.new/Makefile.in
--- funtools-1.3.0b29/Makefile.in 2007-02-28 18:50:16.000000000 +0100
+++ funtools-1.3.0b29.new/Makefile.in 2007-03-26 10:48:41.000000000 +0200
@@ -37,19 +37,19 @@
INSTALL_ROOT =
# Directory in which to install the .a or .so binary for the FUNTOOLS library:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the program wish:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the funtools.h include file:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools
# Top-level directory for manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
# Top-level directory for share entries:
-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools
+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools
# util files are in the util subdirectory
UTIL_INC = -I./util
@@ -60,7 +60,7 @@
# FITSY_LIBS = -L./fitsy -lfitsy
# wcs files are in the wcs subdirectory
-WCS_INC = -I./wcs
+WCS_INC = -I/usr/include/wcs
# WCS_LIBS = -L./wcs -lwcs
# filter files are in the filter subdirectory
@@ -74,7 +74,7 @@
EXTRA_LIBS = @EXTRA_LIBS@
# the full set of libraries for linking
-LIBS = $(UTIL_LIBS) $(FILTER_LIBS) $(WCS_LIBS) $(FITSY_LIBS) \
+LIBS = $(UTIL_LIBS) $(FILTER_LIBS) $(FITSY_LIBS) \
$(EXTRA_LIBS) -lm
# To change the compiler switches, for example to change from -O
@@ -111,6 +111,30 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
+# Added by fedora rpm patch
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+nfodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+# end
+
+
# which awk-like program do we have?
PRE= @PRE@
POST= @POST@
@@ -160,7 +184,7 @@
# this is used in the link line
# LLIB = $(LIB)
-LLIB = @LLIB@
+LLIB = @LLIB@
# libraries containing main as subroutines
MAINLIB = lib$(PACKAGE)MainLib.a
@@ -225,10 +249,10 @@
echo $(PROGS) | ./mkfunmainlib > funmainlib.c;
shlib: sublib $(LIBOBJS)
- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
CC='$(CC)' CXX=$(CXX) \
- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \
+ ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o $(EXTRA_LIBS) -lm; \
rm -rf $(PACKAGE)tmp;)
mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o
@@ -237,7 +261,7 @@
$(RANLIB) lib$(PACKAGE)MainLib.a)
shmainlib: mainlib
- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
CC='$(CC)' CXX='$(CXX)' \
./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\
@@ -251,7 +275,7 @@
@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
(cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \
CC='$(CC)' CXX='$(CXX)' \
- ./mklib -o tclfun $(PACKAGE)tmp/*.o; \
+ ./mklib -o tclfun $(PACKAGE)tmp/*.o $(EXTRA_LIBS) -lm; \
rm -rf $(PACKAGE)tmp; \
test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
SHLIB=libtclfun.so; \
@@ -370,6 +394,7 @@
funtools.ds9: funtools_ds9.tmpl
sed -e 's#PRE#$(PRE)#g;s#POST#$(POST)#g;s#GUNZIP#$(GUNZIP)#g' funtools_ds9.tmpl > funtools.ds9
+ chmod +x funtools.ds9
diff:
@-(for file in "`ls *.c`"; \
@@ -413,7 +438,7 @@
else \
echo "Installing $$i" ; \
$(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
- chmod 555 $(LIB_INSTALL_DIR)/$$i; \
+ chmod 755 $(LIB_INSTALL_DIR)/$$i; \
fi; \
done;)
@@ -422,7 +447,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
- mkdir $$i; \
+ mkdir -p $$i; \
chmod 755 $$i; \
else true; \
fi; \
@@ -432,7 +457,7 @@
echo "Installing $$XLIB"; \
$(INSTALL_DATA) $$XLIB $(LIB_INSTALL_DIR)/$$XLIB; \
(cd $(LIB_INSTALL_DIR); $(RANLIB) $$XLIB); \
- chmod 555 $(LIB_INSTALL_DIR)/$$XLIB; \
+ chmod 755 $(LIB_INSTALL_DIR)/$$XLIB; \
fi;
@echo "Installing funtools.h"
@$(INSTALL_DATA) funtools.h $(INCLUDE_INSTALL_DIR)/funtools.h
@@ -462,7 +487,7 @@
install-man:
@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
echo "Making directory $(MAN_INSTALL_DIR)"; \
- mkdir $(MAN_INSTALL_DIR); \
+ mkdir -p $(MAN_INSTALL_DIR); \
chmod 755 $(MAN_INSTALL_DIR); \
else true; \
fi;
@@ -473,7 +498,7 @@
M="$(MAN_INSTALL_DIR)/man$$E"; \
if [ ! -d $$M ] ; then \
echo "Making directory $$M"; \
- mkdir $$M; \
+ mkdir -p $$M; \
chmod 755 $$M; \
else true; \
fi; \
diff -ur funtools-1.3.0b29/util/Makefile.in funtools-1.3.0b29.new/util/Makefile.in
--- funtools-1.3.0b29/util/Makefile.in 2007-02-09 17:37:53.000000000 +0100
+++ funtools-1.3.0b29.new/util/Makefile.in 2007-03-26 10:47:02.000000000 +0200
@@ -28,7 +28,26 @@
# to the "configure" script.
prefix = @prefix@
-exec_prefix = @exec_prefix@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+nfodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
@@ -38,13 +57,13 @@
INSTALL_ROOT =
# Directory in which to install the .a, .so, and .o files:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the programs:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include files:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util
# extra includes for compiling
INCLUDES =
@@ -174,7 +193,7 @@
$(CC) -I$(ZDIR) -c $(CFLAGS) $(ZDIR)/inffast.c
gio.o: gio.c gio.h
- $(CC) -c $(CC_SWITCHES) -I$(ZDIR) gio.c
+ $(CC) -c $(CC_SWITCHES) gio.c
gcat.o: gcat.c gio.h
@@ -192,7 +211,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
- mkdir $$i; \
+ mkdir -p $$i; \
chmod 755 $$i; \
else true; \
fi; \
diff -ur funtools-1.3.0b29/wcs/Makefile.in funtools-1.3.0b29.new/wcs/Makefile.in
--- funtools-1.3.0b29/wcs/Makefile.in 2006-11-30 19:46:29.000000000 +0100
+++ funtools-1.3.0b29.new/wcs/Makefile.in 2007-03-26 10:47:02.000000000 +0200
@@ -27,7 +27,26 @@
# to the "configure" script.
prefix = @prefix@
-exec_prefix = @exec_prefix@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+nfodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
@@ -37,13 +56,13 @@
INSTALL_ROOT =
# Directory in which to install the .a or .so binary for the WCS library:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
# Directory in which to install the program wish:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install the include file wcs.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools
# To change the compiler switches, for example to change from -O
# to -g, change the following line:
@@ -136,7 +155,7 @@
do \
if [ ! -d $$i ] ; then \
echo "Making directory $$i"; \
- mkdir $$i; \
+ mkdir -p $$i; \
chmod 755 $$i; \
else true; \
fi; \
@@ -148,12 +167,12 @@
(cd $(LIB_INSTALL_DIR); $(RANLIB) $$XLIB); \
chmod 555 $(LIB_INSTALL_DIR)/$$XLIB; \
fi;
- @echo "Installing fitshead.h"
- @$(INSTALL_DATA) fitshead.h $(INCLUDE_INSTALL_DIR)/fitshead.h
- @echo "Installing wcs.h"
- @$(INSTALL_DATA) wcs.h $(INCLUDE_INSTALL_DIR)/wcs.h
- @echo "Installing wcslib.h"
- @$(INSTALL_DATA) wcslib.h $(INCLUDE_INSTALL_DIR)/wcslib.h
+ @echo "Skipping fitshead.h"
+# @$(INSTALL_DATA) fitshead.h $(INCLUDE_INSTALL_DIR)/fitshead.h
+ @echo "Skipping wcs.h"
+# @$(INSTALL_DATA) wcs.h $(INCLUDE_INSTALL_DIR)/wcs.h
+ @echo "Skipping wcslib.h"
+# @$(INSTALL_DATA) wcslib.h $(INCLUDE_INSTALL_DIR)/wcslib.h
Makefile: Makefile.in
$(SHELL) config.status
