X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=locale%2FMakefile;h=4db478ce939186c9f9a70c1ab4d81c29a75528d1;hp=bdda03cb0c890191e3f3af8c37285258ffef859e;hb=e310189747c161ac6e737eedadf8f45d11bf2253;hpb=f7b064491c9a070105575fef5eb35988a0583f36

diff --git a/locale/Makefile b/locale/Makefile
index bdda03cb0..4db478ce9 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,14 +1,10 @@
 #
 # Locale file makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
 # Copyright 1993-2007 by Easy Software Products.
 #
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file.  If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 #
 
 include ../Makedefs
@@ -131,8 +127,8 @@ pot:	checkpo po2strings
 	cd ..; xgettext -o locale/cups.pot -cTRANSLATORS -s \
 		--keyword=_ --no-wrap \
 		--copyright-holder="Apple Inc." \
-		--package-name="CUPS" --package-version="1.6" \
-		--msgid-bugs-address="http://www.cups.org/str.php" \
+		--package-name="CUPS" --package-version="$(CUPS_VERSION)" \
+		--msgid-bugs-address="https://github.com/apple/cups/issues" \
 		*/*.c */*.cxx
 	(cat cups.header; tail +6 cups.pot; cat cups.footer) > cups.pot.N
 	mv cups.pot.N cups.pot
@@ -158,32 +154,30 @@ pot:	checkpo po2strings
 
 checkpo:	checkpo.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
 		$(COMMONLIBS) $(LIBZ)
 
 checkall:	checkpo
-	for file in *.po; do \
-		./checkpo $$file; \
-	done
+	./checkpo *.po *.strings
 
 
 #
 # po2strings - A simple utility which uses iconv to convert GNU gettext
-#              message catalogs to OS X .strings files.
+#              message catalogs to macOS .strings files.
 #
 # po2strings filename.po filename.strings
 #
 
 po2strings:	po2strings.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
 		$(COMMONLIBS) $(LIBZ)
 
 
 #
-# strings2po - A simple utility which uses iconv to convert OS X .strings files
+# strings2po - A simple utility which uses iconv to convert macOS .strings files
 #              to GNU gettext message catalogs.
 #
 # strings2po filename.strings filename.po
@@ -191,7 +185,7 @@ po2strings:	po2strings.o ../cups/$(LIBCUPSSTATIC)
 
 strings2po:	strings2po.o
 	echo Linking $@...
-	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
+	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
 
 
 #