From: Benno Rice <benno@squid-cache.org>
Date: Wed, 27 Aug 2008 05:28:33 +0000 (+1000)
Subject: Merge from upstream, fix build.
X-Git-Tag: SQUID_3_1_0_1~49^2~67^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc940b6728f59b866499008aa5528e2e4df6fa49;p=thirdparty%2Fsquid.git

Merge from upstream, fix build.
---

fc940b6728f59b866499008aa5528e2e4df6fa49
diff --cc errors/Makefile.am
index e42cf6a14c,ea0a489057..434aee6e78
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@@ -88,7 -88,7 +88,7 @@@ uninstall-local
  # undocumented hack.  You can use this target to create multi-lingual
  # error pages.  For example:
  #
--#	make ADDLANG=English DESTLANG=French addlang
++#	$(MAKE) ADDLANG=English DESTLANG=French addlang
  #
  # by Andres Kroonmaa <andre@mail.lbi.ee>
  #
@@@ -120,7 -120,7 +120,7 @@@ dist-hook
  	      || exit 1; \
  	  fi; \
  	done; \
--	make translate; \
++	$(MAKE) translate; \
  	for lang in $(TRANSLATIONS); do \
  	  if test -d $(srcdir)/$$lang ; then \
  		test -d $(distdir)/$$lang \
@@@ -149,4 -149,4 +149,4 @@@ translate
  	fi
  
  all:
--	make translate
++	$(MAKE) translate