From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Thu, 9 Jul 2009 11:08:24 +0000 (-0600)
Subject: Distribute TRANSLATORS properly.
X-Git-Tag: SQUID_3_2_0_1~903
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71704831a1472871f8a9ffb592231b97820b89a7;p=thirdparty%2Fsquid.git

Distribute TRANSLATORS properly.

Also remove '/' from scan paths and add information
about which files are being found for install/uninstall
---

diff --git a/errors/Makefile.am b/errors/Makefile.am
index eeb7e98ffa..5226909fe6 100644
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -11,11 +11,12 @@ DEFAULT_ERROR_DIR	= $(errordir)
 DEFAULT_STYLESHEET	= $(sysconfdir)/errorpage.css
 
 # List of automated translations possible:
-TRANSLATIONPO=`ls -1 $(top_srcdir)/errors/*.po 2>/dev/null | grep -o -E "[a-z\-]+\.po" | sed s/.po//`
-TRANSLATIONDIR=`ls -1 $(srcdir)/ $(builddir)/ 2>/dev/null | sed -e 's%$(srcdir)/%%' -e 's%$(builddir)/%%' -e 's%.po%%' `
+TRANSLATIONPO=`ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//`
+TRANSLATIONDIR=`ls -1 $(srcdir) $(builddir) | sed -e 's%$(srcdir)/%%' -e 's%$(builddir)/%%' -e 's%.po%%' `
 
 install-data-local:
 	for l in $(TRANSLATIONDIR) ; do \
+	  echo "Located $$l for install..."; \
 	  if test -d $(srcdir)/$$l; then \
 		$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \
 		for f in $(srcdir)/$$l/ERR_*; do \
@@ -31,6 +32,7 @@ install-data-local:
 		done; \
 	  fi \
 	done; \
+	$(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)TRANSLATORS; \
 	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
 	if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
 		echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
@@ -43,6 +45,7 @@ install-data-local:
 
 uninstall-local:
 	for l in $(TRANSLATIONDIR) ; do \
+	  echo "Located $$l for uninstall ..."; \
 	  if test -d $(srcdir)/$$l; then \
 		for f in $(srcdir)/$$l/ERR_*; do \
 			if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; then \
@@ -60,6 +63,7 @@ uninstall-local:
 	done;
 	@$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_STYLESHEET)
 	rm -f $(DESTDIR)$(DEFAULT_STYLESHEET).default
+	rm -f $(DESTDIR)TRANSLATORS
 
 
 ## Upgrade requires the new files to be pre-installed
@@ -76,7 +80,7 @@ dist-hook: translate
 		  || exit 1; \
 	  fi; \
 	done; \
-	for f in aliases alias-link.sh alias-upgrade errorpage.css; do \
+	for f in aliases alias-link.sh alias-upgrade errorpage.css TRANSLATORS; do \
 		cp -p $(srcdir)/$$f $(distdir)/`basename $$f`; \
 	done;
 
diff --git a/mksnapshot.sh b/mksnapshot.sh
index 5d095f6966..3c7fd1de48 100755
--- a/mksnapshot.sh
+++ b/mksnapshot.sh
@@ -115,6 +115,6 @@ fi
 # Generate language-pack tarballs
 # NP: Only to be done on HEAD branch.
 if test "${VERSION}" = "3.HEAD" ; then
-	sh -c "cd $tmpdir/errors && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${date}-langpack.tar.gz ./*/* ./alias* "
+	sh -c "cd $tmpdir/errors && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${date}-langpack.tar.gz ./*/* ./alias* ./TRANSLATORS "
 	echo ${PACKAGE}-${VERSION}-${date}-langpack.tar.gz >>${tag}.out
 fi