Ticket #22998: patch-funtools

File patch-funtools, 4.7 KB (added by tim@…, 11 years ago)

update patch, this time correctly

Line 
1diff -Naur funtools-1.4.0.orig/Makefile.in funtools-1.4.0/Makefile.in
2--- funtools-1.4.0.orig/Makefile.in     2007-05-03 03:17:58.000000000 +0200
3+++ funtools-1.4.0/Makefile.in  2009-12-23 17:01:56.000000000 +0200
4@@ -43,10 +43,10 @@
5 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
6 
7 # Directory in which to install the funtools.h include file:
8-INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
9+INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include/funtools
10 
11 # Top-level directory for manual entries:
12-MAN_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/man
13+MAN_INSTALL_DIR =      $(INSTALL_ROOT)$(prefix)/share/man
14 
15 # Top-level directory for share entries:
16 MAN_SHARE_DIR =                $(INSTALL_ROOT)$(prefix)/share/funtools
17diff -Naur funtools-1.4.0.orig/filter/Makefile.in funtools-1.4.0/filter/Makefile.in
18--- funtools-1.4.0.orig/filter/Makefile.in      2006-03-20 20:42:11.000000000 +0200
19+++ funtools-1.4.0/filter/Makefile.in   2009-12-23 17:01:56.000000000 +0200
20@@ -44,7 +44,7 @@
21 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
22 
23 # Directory in which to install the include files:
24-INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
25+INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include/funtools
26 
27 # util files are in the util directory at same level
28 UTIL_INC =             -I../util
29diff -Naur funtools-1.4.0.orig/fitsy/Makefile.in funtools-1.4.0/fitsy/Makefile.in
30--- funtools-1.4.0.orig/fitsy/Makefile.in       2006-10-30 18:51:58.000000000 +0200
31+++ funtools-1.4.0/fitsy/Makefile.in    2009-12-23 17:01:56.000000000 +0200
32@@ -43,7 +43,7 @@
33 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
34 
35 # Directory in which to install the include files:
36-INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
37+INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include/funtools
38 
39 # There are just too many different versions of "install" around;
40 # better to use the install-sh script that comes with the distribution,
41diff -Naur funtools-1.4.0.orig/gnu/Makefile.in funtools-1.4.0/gnu/Makefile.in
42--- funtools-1.4.0.orig/gnu/Makefile.in 2003-11-25 16:35:24.000000000 +0200
43+++ funtools-1.4.0/gnu/Makefile.in      2009-12-23 17:01:56.000000000 +0200
44@@ -59,7 +59,7 @@
45 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
46 
47 # Directory in which to install the include files:
48-INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
49+INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include/funtools
50 
51 # There are just too many different versions of "install" around;
52 # better to use the install-sh script that comes with the distribution,
53diff -Naur funtools-1.4.0.orig/util/Makefile funtools-1.4.0/util/Makefile
54--- funtools-1.4.0.orig/util/Makefile   2007-08-03 19:12:00.000000000 +0200
55+++ funtools-1.4.0/util/Makefile        2009-12-23 17:01:56.000000000 +0200
56@@ -129,7 +129,7 @@
57 
58 TESTPROGS =    tparse
59 
60-PROGS =                gcat
61+PROGS =                fungcat
62 
63 all:           $(LIB) $(PROGS)
64 
65@@ -180,8 +180,8 @@
66 
67 gcat.o:                gcat.c gio.h
68 
69-gcat:          gcat.o $(LIB)
70-               $(CC) $(LDFLAGS) gcat.o -o gcat $(LIB) $(LIBS) $(EXTRA_LIBS)
71+fungcat:       gcat.o $(LIB)
72+               $(CC) $(LDFLAGS) gcat.o -o fungcat $(LIB) $(LIBS) $(EXTRA_LIBS)
73 
74 tparse.o:      tparse.c
75 
76diff -Naur funtools-1.4.0.orig/util/Makefile.in funtools-1.4.0/util/Makefile.in
77--- funtools-1.4.0.orig/util/Makefile.in        2007-05-22 20:37:01.000000000 +0200
78+++ funtools-1.4.0/util/Makefile.in     2009-12-23 17:02:55.000000000 +0200
79@@ -44,7 +44,7 @@
80 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
81 
82 # Directory in which to install the include files:
83-INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
84+INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include/funtools
85 
86 # extra includes for compiling
87 INCLUDES =
88@@ -129,7 +129,7 @@
89 
90 TESTPROGS =    tparse
91 
92-PROGS =                gcat
93+PROGS =                fungcat
94 
95 all:           $(LIB) $(PROGS)
96 
97@@ -180,8 +180,8 @@
98 
99 gcat.o:                gcat.c gio.h
100 
101-gcat:          gcat.o $(LIB)
102-               $(CC) $(LDFLAGS) gcat.o -o gcat $(LIB) $(LIBS) $(EXTRA_LIBS)
103+fungcat:       gcat.o $(LIB)
104+               $(CC) $(LDFLAGS) gcat.o -o fungcat $(LIB) $(LIBS) $(EXTRA_LIBS)
105 
106 tparse.o:      tparse.c
107 
108@@ -219,7 +219,7 @@
109                fi; \
110            done;
111        @for i in NaN.h conf.h file.h find.h gio.h launch.h longlong.h \
112-       macro.h mainlib.h tclmainlib.h mkrtemp.h parse.h prsetup.h \
113+       macro.h mainlib.h tclmainlib.h mkrtemp.h parse.h \
114        xalloc.h strtod.h swap.h word.h xport.h xfileio.h zprocess.h; \
115            do \
116                if [ -f $$i ] ; then \
117diff -Naur funtools-1.4.0.orig/wcs/Makefile.in funtools-1.4.0/wcs/Makefile.in
118--- funtools-1.4.0.orig/wcs/Makefile.in 2006-11-30 20:46:29.000000000 +0200
119+++ funtools-1.4.0/wcs/Makefile.in      2009-12-23 17:01:56.000000000 +0200
120@@ -43,7 +43,7 @@
121 BIN_INSTALL_DIR =      $(INSTALL_ROOT)$(exec_prefix)/bin
122 
123 # Directory in which to install the include file wcs.h:
124-INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include
125+INCLUDE_INSTALL_DIR =  $(INSTALL_ROOT)$(prefix)/include/funtools
126 
127 # To change the compiler switches, for example to change from -O
128 # to -g, change the following line: