From: Amos Jeffries Date: Wed, 8 Jul 2009 14:21:01 +0000 (+1200) Subject: Kick translation again. X-Git-Tag: SQUID_3_2_0_1~905 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c0882c8171150e127b6b0fd2a1b2e7ce86225c6;p=thirdparty%2Fsquid.git Kick translation again. install does not NEED to be translating, and it seems to cause an issue that did not show up my local testing. Makefile proved useless to langpack. --- diff --git a/errors/Makefile.am b/errors/Makefile.am index 129cfdc663..eeb7e98ffa 100644 --- a/errors/Makefile.am +++ b/errors/Makefile.am @@ -14,7 +14,7 @@ DEFAULT_STYLESHEET = $(sysconfdir)/errorpage.css 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%%' ` -install-data-local: translate +install-data-local: for l in $(TRANSLATIONDIR) ; do \ if test -d $(srcdir)/$$l; then \ $(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l && \ diff --git a/mksnapshot.sh b/mksnapshot.sh index ddcd3fdcda..5d095f6966 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* ./Makefile " + sh -c "cd $tmpdir/errors && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${date}-langpack.tar.gz ./*/* ./alias* " echo ${PACKAGE}-${VERSION}-${date}-langpack.tar.gz >>${tag}.out fi