Codebase list libgeotiff / 1bc99f6
Don't patch Makefile.in, but only Makefile.am. Bas Couwenberg 7 years ago
4 changed file(s) with 68 addition(s) and 96 deletion(s). Raw diff Collapse all Expand all
11
22 * New upstream release candidate.
33 * Drop automake-subdir-objects.patch, applied upstream.
4 * Don't patch Makefile.in, but only Makefile.am.
45
56 -- Bas Couwenberg <sebastic@debian.org> Wed, 17 Aug 2016 16:28:15 +0200
67
+0
-95
debian/patches/drop-epsg-data-installation less more
0 Description: Drop EPSG data installation
1 Author: Francesco Paolo Lovergine <frankie@debian.org>
2 Forwarded: not-needed
3
4 --- a/Makefile.in
5 +++ b/Makefile.in
6 @@ -1100,7 +1100,7 @@ distcleancheck: distclean
7 exit 1; } >&2
8 check-am: all-am
9 check: check-recursive
10 -all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) geo_config.h
11 +all-am: Makefile $(LTLIBRARIES) $(HEADERS) geo_config.h
12 installdirs: installdirs-recursive
13 installdirs-am:
14 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(csvdir)" "$(DESTDIR)$(includedir)"; do \
15 @@ -1163,7 +1163,7 @@ info: info-recursive
16
17 info-am:
18
19 -install-data-am: install-dist_csvDATA install-includeHEADERS
20 +install-data-am: install-includeHEADERS
21
22 install-dvi: install-dvi-recursive
23
24 @@ -1211,7 +1211,7 @@ ps: ps-recursive
25
26 ps-am:
27
28 -uninstall-am: uninstall-dist_csvDATA uninstall-includeHEADERS \
29 +uninstall-am: uninstall-includeHEADERS \
30 uninstall-libLTLIBRARIES
31
32 .MAKE: $(am__recursive_targets) all install-am install-strip
33 --- a/Makefile.am
34 +++ b/Makefile.am
35 @@ -23,42 +23,6 @@ AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS)
36
37 csvdir = $(datadir)/epsg_csv
38
39 -dist_csv_DATA = csv/alias.csv \
40 - csv/area.csv \
41 - csv/change.csv \
42 - csv/compdcs.csv \
43 - csv/coordinate_axis.csv \
44 - csv/coordinate_axis_name.csv \
45 - csv/coordinate_operation.csv \
46 - csv/coordinate_operation_method.csv \
47 - csv/coordinate_operation_parameter.csv \
48 - csv/coordinate_operation_parameter_value.csv \
49 - csv/coordinate_operation_path.csv \
50 - csv/coordinate_reference_system.csv \
51 - csv/coordinate_system.csv \
52 - csv/csv2c.py \
53 - csv/csv_tools.py \
54 - csv/datum.csv \
55 - csv/datum_shift.csv \
56 - csv/datum_shift_pref.csv \
57 - csv/deprecation.csv \
58 - csv/ellipsoid.csv \
59 - csv/esri_datum_override.csv \
60 - csv/gcs.csv \
61 - csv/gcs.override.csv \
62 - csv/geoccs.csv \
63 - csv/naming_system.csv \
64 - csv/pcs.csv \
65 - csv/pcs.override.csv \
66 - csv/prime_meridian.csv \
67 - csv/projop_wparm.csv \
68 - csv/stateplane.csv \
69 - csv/supersession.csv \
70 - csv/unit_of_measure.csv \
71 - csv/version_history.csv \
72 - csv/vertcs.csv \
73 - csv/vertcs.override.csv
74 -
75 include_HEADERS = geotiff.h \
76 geo_config.h \
77 geotiffio.h \
78 @@ -100,16 +64,6 @@ libgeotiff_la_SOURCES = cpl_serv.c \
79 geo_strtod.c \
80 geotiff_proj4.c
81
82 -if CSV_IS_CONFIG
83 - libgeotiff_la_SOURCES += csv/datum.c \
84 - csv/ellipsoid.c \
85 - csv/gcs.c \
86 - csv/pcs.c \
87 - csv/prime_meridian.c \
88 - csv/projop_wparm.c \
89 - csv/unit_of_measure.c
90 -endif
91 -
92 libgeotiff_la_LDFLAGS = -version-info 3:2:1
93
94 libgeotiff_la_LIBADD = libxtiff/libxtiff.la
0 Description: Drop EPSG data installation
1 Author: Francesco Paolo Lovergine <frankie@debian.org>
2 Forwarded: not-needed
3
4 --- a/Makefile.am
5 +++ b/Makefile.am
6 @@ -23,42 +23,6 @@ AM_CFLAGS = -I./libxtiff $(PROJ_CFLAGS)
7
8 csvdir = $(datadir)/epsg_csv
9
10 -dist_csv_DATA = csv/alias.csv \
11 - csv/area.csv \
12 - csv/change.csv \
13 - csv/compdcs.csv \
14 - csv/coordinate_axis.csv \
15 - csv/coordinate_axis_name.csv \
16 - csv/coordinate_operation.csv \
17 - csv/coordinate_operation_method.csv \
18 - csv/coordinate_operation_parameter.csv \
19 - csv/coordinate_operation_parameter_value.csv \
20 - csv/coordinate_operation_path.csv \
21 - csv/coordinate_reference_system.csv \
22 - csv/coordinate_system.csv \
23 - csv/csv2c.py \
24 - csv/csv_tools.py \
25 - csv/datum.csv \
26 - csv/datum_shift.csv \
27 - csv/datum_shift_pref.csv \
28 - csv/deprecation.csv \
29 - csv/ellipsoid.csv \
30 - csv/esri_datum_override.csv \
31 - csv/gcs.csv \
32 - csv/gcs.override.csv \
33 - csv/geoccs.csv \
34 - csv/naming_system.csv \
35 - csv/pcs.csv \
36 - csv/pcs.override.csv \
37 - csv/prime_meridian.csv \
38 - csv/projop_wparm.csv \
39 - csv/stateplane.csv \
40 - csv/supersession.csv \
41 - csv/unit_of_measure.csv \
42 - csv/version_history.csv \
43 - csv/vertcs.csv \
44 - csv/vertcs.override.csv
45 -
46 include_HEADERS = geotiff.h \
47 geo_config.h \
48 geotiffio.h \
49 @@ -100,16 +64,6 @@ libgeotiff_la_SOURCES = cpl_serv.c \
50 geo_strtod.c \
51 geotiff_proj4.c
52
53 -if CSV_IS_CONFIG
54 - libgeotiff_la_SOURCES += csv/datum.c \
55 - csv/ellipsoid.c \
56 - csv/gcs.c \
57 - csv/pcs.c \
58 - csv/prime_meridian.c \
59 - csv/projop_wparm.c \
60 - csv/unit_of_measure.c
61 -endif
62 -
63 libgeotiff_la_LDFLAGS = -version-info 3:2:1
64
65 libgeotiff_la_LIBADD = libxtiff/libxtiff.la
0 drop-epsg-data-installation
0 drop-epsg-data-installation.patch