| 1 |
bicatali 10/01/29 18:27:36 |
| 2 |
|
| 3 |
Added: funtools-1.4.4-makefiles.patch |
| 4 |
Log: |
| 5 |
Now included proper makefile patches |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/funtools/files/funtools-1.4.4-makefiles.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: funtools-1.4.4-makefiles.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur funtools-1.4.4.orig/filter/Makefile.in funtools-1.4.4/filter/Makefile.in |
| 17 |
--- funtools-1.4.4.orig/filter/Makefile.in 2010-01-29 18:19:54.000000000 +0000 |
| 18 |
+++ funtools-1.4.4/filter/Makefile.in 2010-01-29 18:20:07.000000000 +0000 |
| 19 |
@@ -29,6 +29,9 @@ |
| 20 |
|
| 21 |
prefix = @prefix@ |
| 22 |
exec_prefix = @exec_prefix@ |
| 23 |
+bindir = @bindir@ |
| 24 |
+includedir = @includedir@ |
| 25 |
+libdir = @libdir@ |
| 26 |
|
| 27 |
# The following definition can be set to non-null for special systems |
| 28 |
# like AFS with replication. It allows the pathnames used for installation |
| 29 |
@@ -38,13 +41,13 @@ |
| 30 |
INSTALL_ROOT = |
| 31 |
|
| 32 |
# Directory in which to install the .a, .so, and .o files: |
| 33 |
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib |
| 34 |
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) |
| 35 |
|
| 36 |
# Directory in which to install the programs: |
| 37 |
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin |
| 38 |
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) |
| 39 |
|
| 40 |
# Directory in which to install the include files: |
| 41 |
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include |
| 42 |
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filter |
| 43 |
|
| 44 |
# util files are in the util directory at same level |
| 45 |
UTIL_INC = -I../util |
| 46 |
@@ -55,7 +58,7 @@ |
| 47 |
#FITSY_LIBS = -L../fitsy |
| 48 |
|
| 49 |
# wcs files are in the wcs subdirectory |
| 50 |
-WCS_INC = -I../wcs |
| 51 |
+WCS_INC = -I/usr/include/wcs |
| 52 |
#WCS_LIBS = -L../wcs -lwcs |
| 53 |
|
| 54 |
# extra includes for compiling |
| 55 |
@@ -161,7 +164,7 @@ |
| 56 |
do \ |
| 57 |
if [ ! -d $$i ] ; then \ |
| 58 |
echo "Making directory $$i"; \ |
| 59 |
- mkdir $$i; \ |
| 60 |
+ mkdir -p $$i; \ |
| 61 |
chmod 755 $$i; \ |
| 62 |
else true; \ |
| 63 |
fi; \ |
| 64 |
@@ -230,6 +233,10 @@ |
| 65 |
$(RM) swap_c.h |
| 66 |
./inc.sed SWAP_C < swap.c > swap_c.h |
| 67 |
|
| 68 |
+swap_c.h: swap.c inc.sed |
| 69 |
+ $(RM) swap_c.h |
| 70 |
+ ./inc.sed SWAP_C < swap.c > swap_c.h |
| 71 |
+ |
| 72 |
events_c.h: evfilter.c inc.sed |
| 73 |
$(RM) events_c.h |
| 74 |
./inc.sed EVENTS_C < evfilter.c > events_c.h |
| 75 |
diff -Nur funtools-1.4.4.orig/fitsy/Makefile.in funtools-1.4.4/fitsy/Makefile.in |
| 76 |
--- funtools-1.4.4.orig/fitsy/Makefile.in 2010-01-29 18:19:54.000000000 +0000 |
| 77 |
+++ funtools-1.4.4/fitsy/Makefile.in 2010-01-29 18:20:07.000000000 +0000 |
| 78 |
@@ -28,6 +28,11 @@ |
| 79 |
|
| 80 |
prefix = @prefix@ |
| 81 |
exec_prefix = @exec_prefix@ |
| 82 |
+bindir = @bindir@ |
| 83 |
+includedir = @includedir@ |
| 84 |
+mandir = @mandir@ |
| 85 |
+datadir = @datadir@ |
| 86 |
+libdir = @libdir@ |
| 87 |
|
| 88 |
# The following definition can be set to non-null for special systems |
| 89 |
# like AFS with replication. It allows the pathnames used for installation |
| 90 |
@@ -37,13 +42,13 @@ |
| 91 |
INSTALL_ROOT = |
| 92 |
|
| 93 |
# Directory in which to install the .a, .so, and .o files: |
| 94 |
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib |
| 95 |
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) |
| 96 |
|
| 97 |
# Directory in which to install the programs: |
| 98 |
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin |
| 99 |
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) |
| 100 |
|
| 101 |
# Directory in which to install the include files: |
| 102 |
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include |
| 103 |
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy |
| 104 |
|
| 105 |
# There are just too many different versions of "install" around; |
| 106 |
# better to use the install-sh script that comes with the distribution, |
| 107 |
@@ -187,7 +192,7 @@ |
| 108 |
do \ |
| 109 |
if [ ! -d $$i ] ; then \ |
| 110 |
echo "Making directory $$i"; \ |
| 111 |
- mkdir $$i; \ |
| 112 |
+ mkdir -p $$i; \ |
| 113 |
chmod 755 $$i; \ |
| 114 |
else true; \ |
| 115 |
fi; \ |
| 116 |
diff -Nur funtools-1.4.4.orig/gnu/Makefile.in funtools-1.4.4/gnu/Makefile.in |
| 117 |
--- funtools-1.4.4.orig/gnu/Makefile.in 2010-01-29 18:19:54.000000000 +0000 |
| 118 |
+++ funtools-1.4.4/gnu/Makefile.in 2010-01-29 18:20:07.000000000 +0000 |
| 119 |
@@ -21,6 +21,11 @@ |
| 120 |
|
| 121 |
prefix = @prefix@ |
| 122 |
exec_prefix = @exec_prefix@ |
| 123 |
+bindir = @bindir@ |
| 124 |
+includedir = @includedir@ |
| 125 |
+mandir = @mandir@ |
| 126 |
+datadir = @datadir@ |
| 127 |
+libdir = @libdir@ |
| 128 |
|
| 129 |
# The following definition can be set to non-null for special systems |
| 130 |
# like AFS with replication. It allows the pathnames used for installation |
| 131 |
@@ -53,13 +58,13 @@ |
| 132 |
EXTRA_OBJS = @EXTRA_OBJS@ |
| 133 |
|
| 134 |
# Directory in which to install the .a, .so, and .o files: |
| 135 |
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib |
| 136 |
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) |
| 137 |
|
| 138 |
# Directory in which to install the programs: |
| 139 |
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin |
| 140 |
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) |
| 141 |
|
| 142 |
# Directory in which to install the include files: |
| 143 |
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include |
| 144 |
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) |
| 145 |
|
| 146 |
# There are just too many different versions of "install" around; |
| 147 |
# better to use the install-sh script that comes with the distribution, |
| 148 |
diff -Nur funtools-1.4.4.orig/Makefile.in funtools-1.4.4/Makefile.in |
| 149 |
--- funtools-1.4.4.orig/Makefile.in 2010-01-29 18:19:54.000000000 +0000 |
| 150 |
+++ funtools-1.4.4/Makefile.in 2010-01-29 18:20:07.000000000 +0000 |
| 151 |
@@ -28,6 +28,11 @@ |
| 152 |
|
| 153 |
prefix = @prefix@ |
| 154 |
exec_prefix = @exec_prefix@ |
| 155 |
+bindir = @bindir@ |
| 156 |
+includedir = @includedir@ |
| 157 |
+mandir = @mandir@ |
| 158 |
+datadir = @datadir@ |
| 159 |
+libdir = @libdir@ |
| 160 |
|
| 161 |
# The following definition can be set to non-null for special systems |
| 162 |
# like AFS with replication. It allows the pathnames used for installation |
| 163 |
@@ -37,19 +42,19 @@ |
| 164 |
INSTALL_ROOT = |
| 165 |
|
| 166 |
# Directory in which to install the .a or .so binary for the FUNTOOLS library: |
| 167 |
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib |
| 168 |
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) |
| 169 |
|
| 170 |
# Directory in which to install the program wish: |
| 171 |
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin |
| 172 |
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) |
| 173 |
|
| 174 |
# Directory in which to install the funtools.h include file: |
| 175 |
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include |
| 176 |
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools |
| 177 |
|
| 178 |
# Top-level directory for manual entries: |
| 179 |
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man |
| 180 |
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) |
| 181 |
|
| 182 |
# Top-level directory for share entries: |
| 183 |
-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools |
| 184 |
+MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools |
| 185 |
|
| 186 |
# util files are in the util subdirectory |
| 187 |
UTIL_INC = -I./util |
| 188 |
@@ -60,7 +65,7 @@ |
| 189 |
# FITSY_LIBS = -L./fitsy -lfitsy |
| 190 |
|
| 191 |
# wcs files are in the wcs subdirectory |
| 192 |
-WCS_INC = -I./wcs |
| 193 |
+WCS_INC = -I/usr/include/wcs |
| 194 |
# WCS_LIBS = -L./wcs -lwcs |
| 195 |
|
| 196 |
# filter files are in the filter subdirectory |
| 197 |
@@ -225,7 +230,7 @@ |
| 198 |
echo $(PROGS) | ./mkfunmainlib > funmainlib.c; |
| 199 |
|
| 200 |
shlib: sublib $(LIBOBJS) |
| 201 |
- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ |
| 202 |
+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ |
| 203 |
(cd $(PACKAGE)tmp && ar x ../$(LIB)); \ |
| 204 |
CC='$(CC)' CXX=$(CXX) \ |
| 205 |
./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \ |
| 206 |
@@ -237,7 +242,7 @@ |
| 207 |
$(RANLIB) lib$(PACKAGE)MainLib.a) |
| 208 |
|
| 209 |
shmainlib: mainlib |
| 210 |
- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ |
| 211 |
+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ |
| 212 |
(cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \ |
| 213 |
CC='$(CC)' CXX='$(CXX)' \ |
| 214 |
./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\ |
| 215 |
@@ -248,7 +253,7 @@ |
| 216 |
$(RANLIB) libtclfun.a) |
| 217 |
|
| 218 |
shtclfun: tclfun |
| 219 |
- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \ |
| 220 |
+ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \ |
| 221 |
(cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \ |
| 222 |
CC='$(CC)' CXX='$(CXX)' \ |
| 223 |
./mklib -o tclfun $(PACKAGE)tmp/*.o; \ |
| 224 |
@@ -422,7 +427,7 @@ |
| 225 |
do \ |
| 226 |
if [ ! -d $$i ] ; then \ |
| 227 |
echo "Making directory $$i"; \ |
| 228 |
- mkdir $$i; \ |
| 229 |
+ mkdir -p $$i; \ |
| 230 |
chmod 755 $$i; \ |
| 231 |
else true; \ |
| 232 |
fi; \ |
| 233 |
@@ -462,7 +467,7 @@ |
| 234 |
install-man: |
| 235 |
@if [ ! -d $(MAN_INSTALL_DIR) ] ; then \ |
| 236 |
echo "Making directory $(MAN_INSTALL_DIR)"; \ |
| 237 |
- mkdir $(MAN_INSTALL_DIR); \ |
| 238 |
+ mkdir -p $(MAN_INSTALL_DIR); \ |
| 239 |
chmod 755 $(MAN_INSTALL_DIR); \ |
| 240 |
else true; \ |
| 241 |
fi; |
| 242 |
@@ -473,7 +478,7 @@ |
| 243 |
M="$(MAN_INSTALL_DIR)/man$$E"; \ |
| 244 |
if [ ! -d $$M ] ; then \ |
| 245 |
echo "Making directory $$M"; \ |
| 246 |
- mkdir $$M; \ |
| 247 |
+ mkdir -p $$M; \ |
| 248 |
chmod 755 $$M; \ |
| 249 |
else true; \ |
| 250 |
fi; \ |
| 251 |
diff -Nur funtools-1.4.4.orig/util/Makefile.in funtools-1.4.4/util/Makefile.in |
| 252 |
--- funtools-1.4.4.orig/util/Makefile.in 2010-01-29 18:19:54.000000000 +0000 |
| 253 |
+++ funtools-1.4.4/util/Makefile.in 2010-01-29 18:20:07.000000000 +0000 |
| 254 |
@@ -29,6 +29,11 @@ |
| 255 |
|
| 256 |
prefix = @prefix@ |
| 257 |
exec_prefix = @exec_prefix@ |
| 258 |
+bindir = @bindir@ |
| 259 |
+includedir = @includedir@ |
| 260 |
+mandir = @mandir@ |
| 261 |
+datadir = @datadir@ |
| 262 |
+libdir = @libdir@ |
| 263 |
|
| 264 |
# The following definition can be set to non-null for special systems |
| 265 |
# like AFS with replication. It allows the pathnames used for installation |
| 266 |
@@ -38,13 +43,13 @@ |
| 267 |
INSTALL_ROOT = |
| 268 |
|
| 269 |
# Directory in which to install the .a, .so, and .o files: |
| 270 |
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib |
| 271 |
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) |
| 272 |
|
| 273 |
# Directory in which to install the programs: |
| 274 |
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin |
| 275 |
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) |
| 276 |
|
| 277 |
# Directory in which to install the include files: |
| 278 |
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include |
| 279 |
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util |
| 280 |
|
| 281 |
# extra includes for compiling |
| 282 |
INCLUDES = |
| 283 |
@@ -200,12 +205,24 @@ |
| 284 |
tlaunch2: tlaunch2.o |
| 285 |
$(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2 |
| 286 |
|
| 287 |
+tlaunch.o: tlaunch.c |
| 288 |
+ |
| 289 |
+tlaunch: tlaunch.o launch.o $(LIB) |
| 290 |
+ $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch $(LIB) $(LIBS) \ |
| 291 |
+ $(EXTRA_LIBS) |
| 292 |
+ |
| 293 |
+tlaunch2.o: tlaunch2.c |
| 294 |
+ |
| 295 |
+tlaunch2: tlaunch2.o |
| 296 |
+ $(CC) $(LDFLAGS) tlaunch2.o -o tlaunch2 |
| 297 |
+ |
| 298 |
+ |
| 299 |
install-binaries: $(LIB) $(PROGS) |
| 300 |
@for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ |
| 301 |
do \ |
| 302 |
if [ ! -d $$i ] ; then \ |
| 303 |
echo "Making directory $$i"; \ |
| 304 |
- mkdir $$i; \ |
| 305 |
+ mkdir -p $$i; \ |
| 306 |
chmod 755 $$i; \ |
| 307 |
else true; \ |
| 308 |
fi; \ |
| 309 |
@@ -272,4 +289,11 @@ |
| 310 |
purift $(CC) $(LDFLAGS) tlaunch.o xlaunch.o -o tlaunch \ |
| 311 |
$(LIB) $(LIBS) $(EXTRA_LIBS) |
| 312 |
|
| 313 |
+pure: tlaunch.pure |
| 314 |
+ |
| 315 |
+tlaunch.pure: tlaunch.o launch.o $(LIB) |
| 316 |
+ purift $(CC) $(LDFLAGS) tlaunch.o launch.o -o tlaunch \ |
| 317 |
+ $(LIB) $(LIBS) $(EXTRA_LIBS) |
| 318 |
+ |
| 319 |
+ |
| 320 |
# DO NOT DELETE THIS LINE -- make depend depends on it. |
Archives