X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=opt%2Frsl%2Frsl-automake.patch;fp=opt%2Frsl%2Frsl-automake.patch;h=1d1b3087fb17830e3eceb7c5648671134ca2d0ce;hp=0000000000000000000000000000000000000000;hb=b7d744b437ea8794e3483cc10906de51e0f49136;hpb=721c55f22af98cf2fcc247169836e9b355a47104 diff --git a/opt/rsl/rsl-automake.patch b/opt/rsl/rsl-automake.patch new file mode 100644 index 0000000..1d1b308 --- /dev/null +++ b/opt/rsl/rsl-automake.patch @@ -0,0 +1,224 @@ +diff -ru rsl-v1.40/colors/Makefile.am rsl-v1.40.new/colors/Makefile.am +--- rsl-v1.40/colors/Makefile.am 1999-12-10 03:28:38.000000000 +0000 ++++ rsl-v1.40.new/colors/Makefile.am 2008-12-27 11:26:01.000000000 +0000 +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-colordir = $(prefix)/lib/colors ++colordir = $(datadir)/rsl/colors + color_DATA = *.??? + + EXTRA_DIST = $(color_DATA) +diff -ru rsl-v1.40/colors/Makefile.in rsl-v1.40.new/colors/Makefile.in +--- rsl-v1.40/colors/Makefile.in 2008-12-27 11:30:45.000000000 +0000 ++++ rsl-v1.40.new/colors/Makefile.in 2008-12-27 11:26:07.000000000 +0000 +@@ -166,7 +166,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = foreign +-colordir = $(prefix)/lib/colors ++colordir = $(datadir)/rsl/colors + color_DATA = *.??? + EXTRA_DIST = $(color_DATA) + all: all-am +diff -ru rsl-v1.40/Makefile.am rsl-v1.40.new/Makefile.am +--- rsl-v1.40/Makefile.am 2008-10-10 20:06:57.000000000 +0000 ++++ rsl-v1.40.new/Makefile.am 2008-12-27 11:25:59.000000000 +0000 +@@ -1,73 +1,49 @@ + ## Process w/ automake. Or, autoreconf; make ## ++AM_CFLAGS = -DDATADIR="\"$(datadir)/rsl\"" + AUTOMAKE_OPTIONS = foreign + SUBDIRS = . colors doc examples + INCLUDES = -I. -I$(srcdir) -I$(prefix)/include -I$(prefix)/toolkit/include + +-includedir = $(prefix)/include +-colordir = $(libdir)/colors +- + lib_LTLIBRARIES = librsl.la + +-librsl_la_LDFLAGS = -version-info 1:40 +-librsl_la_SOURCES = \ +-$(rapic_c) $(radtec_c)\ +-dorade.c dorade_print.c dorade_to_radar.c\ +-lassen.c lassen_to_radar.c \ +-edge_to_radar.c \ +- radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \ +- range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \ +- carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \ +- ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \ +- mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \ +- gzip.c prune.c reverse.c fix_headers.c \ +- nsig_to_radar.c nsig.c nsig2_to_radar.c \ +- africa_to_radar.c africa.c \ +- radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \ +- radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers) +- +-librsl_la_DEPENDENCIES = $(build_headers) ++wsr88ddir = $(datadir)/rsl/ ++dist_wsr88d_DATA = wsr88d_locations.dat + +-build_headers = rsl.h wsr88d.h toolkit_1BC-51_appl.h ++include_HEADERS = rsl.h toolkit_1BC-51_appl.h + + headers = africa.h dorade.h lassen.h \ + mcgill.h nsig.h radtec.h rainbow.h \ + rapic_routines.h toga.h \ +- $(build_headers) ++ wsr88d.h \ ++ $(include_HEADERS) ++ ++librsl_la_LDFLAGS = -version-info 1:40 ++librsl_la_SOURCES = \ ++ $(rapic_c) $(radtec_c) \ ++ dorade.c dorade_print.c dorade_to_radar.c \ ++ lassen.c lassen_to_radar.c \ ++ edge_to_radar.c \ ++ radar.c volume.c image_gen.c cappi.c fraction.c read_write.c farea.c \ ++ range.c radar_to_uf.c uf_to_radar.c wsr88d_to_radar.c \ ++ carpi.c cube.c sort_rays.c toga_to_radar.c gts.c histogram.c \ ++ ray_indexes.c anyformat_to_radar.c get_win.c endian.c mcgill_to_radar.c \ ++ mcgill.c interp.c toga.c wsr88d.c wsr88d_get_site.c wsr88d_m31.c \ ++ gzip.c prune.c reverse.c fix_headers.c \ ++ nsig_to_radar.c nsig.c nsig2_to_radar.c \ ++ africa_to_radar.c africa.c \ ++ radar_to_hdf_2.c hdf_to_radar.c toolkit_memory_mgt.c \ ++ radar_to_hdf_1.c rainbow.c rainbow_to_radar.c $(headers) ++ + + rapic_c = rapic_to_radar.c rapic.y rapic-lex.l rapic_routines.c + radtec_c = radtec_to_radar.c radtec.c + + +-rsl.h: Makefile +- @for h in $(build_headers); do \ +- echo -n "Checking substitutions in header file $$h ... "; \ +- cp $$h $$h.in; \ +- sed -e 's/RSL_VERSION_STR.*/RSL_VERSION_STR \"$(VERSION)\"/' \ +- -e 's|#define COLORDIR.*|#define COLORDIR \"$(colordir)\"|' \ +- -e 's|#define WSR88D_SITE_INFO_FILE.*|#define WSR88D_SITE_INFO_FILE \"$(libdir)/wsr88d_locations.dat\"|' \ +- < $$h.in > $$h.new; \ +- if cmp -s $$h $$h.new; then \ +- rm $$h.new; \ +- echo "$$h remains untouched."; \ +- else \ +- mv $$h.new $$h; \ +- echo "substitutions made in $$h."; \ +- fi; \ +- rm -f $$h.in; \ +- done +- + PREFIX = rapic + LFLAGS = -P$(PREFIX) + YFLAGS = -d -p $(PREFIX) + LEX_OUTPUT_ROOT = lex.$(PREFIX) + +- +-install-exec-hook: +- $(INSTALL) -d $(includedir) +- $(INSTALL) -m 644 rsl.h $(includedir) +- $(INSTALL) -m 644 toolkit_1BC-51_appl.h $(includedir) +- $(INSTALL) -m 644 wsr88d_locations.dat $(libdir) +- + EXTRA_DIST = CHANGES CHECK_LIST Copyright GPL LGPL wsr88d_locations.dat rapic.h + + DISTCLEANFILES = rapic.c rapic-lex.c +diff -ru rsl-v1.40/radar.c rsl-v1.40.new/radar.c +--- rsl-v1.40/radar.c 2006-08-09 19:35:53.000000000 +0000 ++++ rsl-v1.40.new/radar.c 2008-12-27 11:13:43.000000000 +0000 +@@ -60,7 +60,7 @@ + + void RSL_print_version() + { +- printf("RSL version %s.\n", RSL_VERSION_STR); ++ printf("RSL version %s.\n", VERSION); + } + + /* Debug printing global variable: radar_verbose_flag */ +diff -ru rsl-v1.40/radar_to_uf.c rsl-v1.40.new/radar_to_uf.c +--- rsl-v1.40/radar_to_uf.c 2008-04-16 19:34:41.000000000 +0000 ++++ rsl-v1.40.new/radar_to_uf.c 2008-12-27 11:13:58.000000000 +0000 +@@ -316,7 +316,7 @@ + uf_ma[37] = tm->tm_year % 100; /* Same format as data year */ + uf_ma[38] = tm->tm_mon+1; + uf_ma[39] = tm->tm_mday; +- memcpy(&uf_ma[40], "RSL" RSL_VERSION_STR, 8); ++ memcpy(&uf_ma[40], "RSL" VERSION, 8); + if (little_endian()) swap2(&uf_ma[40], 8/2); + uf_ma[44] = (signed short)UF_NO_DATA; + len_ma = 45; +diff -ru rsl-v1.40/read_write.c rsl-v1.40.new/read_write.c +--- rsl-v1.40/read_write.c 2008-10-07 22:30:06.000000000 +0000 ++++ rsl-v1.40.new/read_write.c 2008-12-27 11:14:05.000000000 +0000 +@@ -314,7 +314,7 @@ + if (radar == NULL) return 0; + + memset(title, 0, sizeof(title)); +- (void)sprintf(title, "RSL v%s. sizeof(Range) %d", RSL_VERSION_STR, sizeof(Range)); ++ (void)sprintf(title, "RSL v%s. sizeof(Range) %d", VERSION, sizeof(Range)); + n += fwrite(title, sizeof(char), sizeof(title), fp); + + memset(header_buf, 0, sizeof(header_buf)); +diff -ru rsl-v1.40/rsl.h rsl-v1.40.new/rsl.h +--- rsl-v1.40/rsl.h 2008-10-10 20:09:36.000000000 +0000 ++++ rsl-v1.40.new/rsl.h 2008-12-27 11:15:24.000000000 +0000 +@@ -27,8 +27,6 @@ + #include "config.h" + #endif + +-#define RSL_VERSION_STR "v1.40" +- + /**********************************************************************/ + /* Configure: Define USE_TWO_BYTE_PRECISION to have RSL store internal*/ + /* values with two bytes. Otherwise, use one byte. */ +@@ -46,7 +44,7 @@ + /* so you shouldn't have to modify anything here. */ + /**********************************************************************/ + #ifndef COLORDIR +-#define COLORDIR "/usr/local/trmm/GVBOX/lib/colors" ++#define COLORDIR DATADIR "/colors" + #endif + + /* These are the color table indexes. See RSL_set/get_color_table. */ +@@ -57,18 +55,18 @@ + /* The default color tables for reflectivity, velocity, spectral width, + * height, rainfall, and zdr. + */ +-#define REFL_RED_FILE COLORDIR "/red_reflectivity.clr" +-#define REFL_GREEN_FILE COLORDIR "/grn_reflectivity.clr" +-#define REFL_BLUE_FILE COLORDIR "/blu_reflectivity.clr" +-#define VEL_RED_FILE COLORDIR "/red_velocity.clr" +-#define VEL_GREEN_FILE COLORDIR "/grn_velocity.clr" +-#define VEL_BLUE_FILE COLORDIR "/blu_velocity.clr" +-#define SW_RED_FILE COLORDIR "/red_spectral_width.clr" +-#define SW_GREEN_FILE COLORDIR "/grn_spectral_width.clr" +-#define SW_BLUE_FILE COLORDIR "/blu_spectral_width.clr" +-#define HEIGHT_RED_FILE COLORDIR "/red_height.clr" +-#define HEIGHT_GREEN_FILE COLORDIR "/grn_height.clr" +-#define HEIGHT_BLUE_FILE COLORDIR "/blu_height.clr" ++#define REFL_RED_FILE COLORDIR "/red_reflectivity.clr" ++#define REFL_GREEN_FILE COLORDIR "/grn_reflectivity.clr" ++#define REFL_BLUE_FILE COLORDIR "/blu_reflectivity.clr" ++#define VEL_RED_FILE COLORDIR "/red_velocity.clr" ++#define VEL_GREEN_FILE COLORDIR "/grn_velocity.clr" ++#define VEL_BLUE_FILE COLORDIR "/blu_velocity.clr" ++#define SW_RED_FILE COLORDIR "/red_spectral_width.clr" ++#define SW_GREEN_FILE COLORDIR "/grn_spectral_width.clr" ++#define SW_BLUE_FILE COLORDIR "/blu_spectral_width.clr" ++#define HEIGHT_RED_FILE COLORDIR "/red_height.clr" ++#define HEIGHT_GREEN_FILE COLORDIR "/grn_height.clr" ++#define HEIGHT_BLUE_FILE COLORDIR "/blu_height.clr" + #define RAINFALL_RED_FILE COLORDIR "/red_rainfall.clr" + #define RAINFALL_GREEN_FILE COLORDIR "/grn_rainfall.clr" + #define RAINFALL_BLUE_FILE COLORDIR "/blu_rainfall.clr" +diff -ru rsl-v1.40/wsr88d.h rsl-v1.40.new/wsr88d.h +--- rsl-v1.40/wsr88d.h 2004-03-12 17:12:09.000000000 +0000 ++++ rsl-v1.40.new/wsr88d.h 2008-12-27 11:16:01.000000000 +0000 +@@ -7,7 +7,7 @@ + * The directory should be the same as the LIBDIR in the makefile. + */ + #ifndef WSR88D_SITE_INFO_FILE +-#define WSR88D_SITE_INFO_FILE "/usr/local/trmm/GVBOX/lib/wsr88d_locations.dat" ++#define WSR88D_SITE_INFO_FILE DATADIR "/wsr88d_locations.dat" + #endif + /*===============================================================*/ + typedef struct {