patches/iso-codes-01-msgfmt.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 5882 fae6eade35a5
child 9036 908e01595df9
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     1
diff -ur iso-codes.orig/iso_3166/Makefile iso-codes/iso_3166/Makefile
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     2
--- iso-codes.orig/iso_3166/Makefile	2005-09-16 01:16:47.778880000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     3
+++ iso-codes/iso_3166/Makefile	2005-09-16 01:19:00.071534000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     4
@@ -12,6 +12,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     5
 destdir=${PREFIX}/share/locale
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     6
 SHAREDIR=${PREFIX}/share/iso-codes
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     7
 SUBDIRS=iso_3166_1 iso_3166_2 iso_3166_3
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     8
+MSGFMT_OPTS=--verbose --check
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
     9
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    10
 all: iso_3166.pot ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    11
 	for d in ${SUBDIRS} ; do ${MAKE} -C $$d all ; done
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    12
@@ -34,7 +35,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    13
 	  --no-location --add-comments $<
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    14
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    15
 %.mo: %.po
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    16
-	msgfmt --verbose --check $< -o $@
5882
laca
parents: 5880
diff changeset
    17
+	msgfmt $(MSGFMT_OPTS) -o $@ $<
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    18
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    19
 clean: 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    20
 	rm -f iso_3166.pot *~ *.mo 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    21
diff -ur iso-codes.orig/iso_3166/iso_3166_1/Makefile iso-codes/iso_3166/iso_3166_1/Makefile
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    22
--- iso-codes.orig/iso_3166/iso_3166_1/Makefile	2005-09-16 01:16:47.683110000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    23
+++ iso-codes/iso_3166/iso_3166_1/Makefile	2005-09-16 01:18:28.935547000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    24
@@ -11,7 +11,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    25
 MKDIR_P=mkdir -p
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    26
 destdir=${PREFIX}/share/locale
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    27
 SHAREDIR=$(PREFIX)/share/iso-codes
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    28
-
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    29
+MSGFMT_OPTS=--verbose --check
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    30
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    31
 all: ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    32
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    33
@@ -34,7 +34,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    34
 	 --from-code=UTF-8 --add-comments $<
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    35
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    36
 %.mo: %.po
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    37
-	msgfmt --verbose --check $< -o $@
5882
laca
parents: 5880
diff changeset
    38
+	msgfmt $(MSGFMT_OPTS) -o $@ $<
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    39
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    40
 clean: 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    41
 	rm -f  *~ *.mo iso_*.h
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    42
diff -ur iso-codes.orig/iso_3166/iso_3166_2/Makefile iso-codes/iso_3166/iso_3166_2/Makefile
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    43
--- iso-codes.orig/iso_3166/iso_3166_2/Makefile	2005-09-16 01:16:47.841895000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    44
+++ iso-codes/iso_3166/iso_3166_2/Makefile	2005-09-16 01:19:32.666453000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    45
@@ -11,7 +11,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    46
 MKDIR_P=mkdir -p
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    47
 destdir=${PREFIX}/share/locale
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    48
 SHAREDIR=$(PREFIX)/share/iso-codes
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    49
-
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    50
+MSGFMT_OPTS=--verbose --check
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    51
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    52
 all: ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    53
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    54
@@ -34,7 +34,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    55
 	 --from-code=UTF-8  --output $@ $<
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    56
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    57
 %.mo: %.po
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    58
-	msgfmt --verbose --check $< -o $@
5882
laca
parents: 5880
diff changeset
    59
+	msgfmt $(MSGFMT_OPTS) -o $@ $<
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    60
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    61
 clean: 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    62
 	rm -f  *~ *.mo iso_*.h
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    63
diff -ur iso-codes.orig/iso_3166/iso_3166_3/Makefile iso-codes/iso_3166/iso_3166_3/Makefile
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    64
--- iso-codes.orig/iso_3166/iso_3166_3/Makefile	2005-09-16 01:16:48.550787000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    65
+++ iso-codes/iso_3166/iso_3166_3/Makefile	2005-09-16 01:19:53.465861000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    66
@@ -11,6 +11,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    67
 MKDIR_P=mkdir -p
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    68
 destdir=${PREFIX}/share/locale
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    69
 SHAREDIR=$(PREFIX)/share/iso-codes
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    70
+MSGFMT_OPTS=--verbose --check
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    71
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    72
 all: ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    73
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    74
@@ -33,7 +34,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    75
 	  --no-location --add-comments $<
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    76
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    77
 %.mo: %.po
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    78
-	msgfmt --verbose --check $< -o $@
5882
laca
parents: 5880
diff changeset
    79
+	msgfmt $(MSGFMT_OPTS) -o $@ $<
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    80
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    81
 clean: 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    82
 	rm -f  *~ *.mo iso_*.h
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    83
diff -ur iso-codes.orig/iso_4217/Makefile iso-codes/iso_4217/Makefile
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    84
--- iso-codes.orig/iso_4217/Makefile	2005-09-16 01:16:48.578394000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    85
+++ iso-codes/iso_4217/Makefile	2005-09-16 01:20:23.750675000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    86
@@ -12,6 +12,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    87
 INSTALL=/usr/bin/install -m 644 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    88
 destdir=${PREFIX}/share/locale
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    89
 sharedir=${PREFIX}/share/iso-codes/
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    90
+MSGFMT_OPTS=--verbose --check
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    91
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    92
 all: ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    93
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    94
@@ -34,7 +35,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    95
 	  --from-code=UTF-8 --output $@ $<
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    96
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    97
 %.mo: %.po
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
    98
-	msgfmt --verbose --check $< -o $@
5882
laca
parents: 5880
diff changeset
    99
+	msgfmt $(MSGFMT_OPTS) -o $@ $<
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   100
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   101
 clean: 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   102
 	rm -f *.pot *~ *.mo *.h
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   103
diff -ur iso-codes.orig/iso_639/Makefile iso-codes/iso_639/Makefile
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   104
--- iso-codes.orig/iso_639/Makefile	2005-09-16 01:16:48.602853000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   105
+++ iso-codes/iso_639/Makefile	2005-09-16 01:20:49.469291000 +0100
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   106
@@ -14,6 +14,8 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   107
 includedir=${PREFIX}/include
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   108
 destdir=${PREFIX}/share/locale
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   109
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   110
+MSGFMT_OPTS=--verbose --check
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   111
+
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   112
 all: iso_639.pot ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   113
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   114
 install: ${HEADER_FILES} ${MO_FILES}
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   115
@@ -36,7 +38,7 @@
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   116
 	 --output $@ --add-comments $<
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   117
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   118
 %.mo: %.po
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   119
-	msgfmt --verbose --check $< -o $@
5882
laca
parents: 5880
diff changeset
   120
+	msgfmt $(MSGFMT_OPTS) -o $@ $<
5880
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   121
 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   122
 clean: 
733baab77e2e 2005-09-15 Laszlo Peter <[email protected]>
laca
parents:
diff changeset
   123
 	rm -f *.pot *~ *.mo *.h