Respect $(MAKE) in error translation build. On FreeBSD, make is not GNU make. GNU make can be installed from ports, but it is installed as gmake, not make. This makes it vital that Makefiles that wish to work on FreeBSD always invoke make with $(MAKE) instead of make. The recent error translation stuff did not follow this, and thus the build broke on FreeBSD. Fix this.
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: file:///home/benno/squid-work/squid3-repo/trunk/ # testament_sha1: 6693fca767c362f9327183ed037f293e7538e4af # timestamp: 2008-08-27 16:05:31 +1000 # base_revision_id: [EMAIL PROTECTED] # 8ocvm4k9gd58smgq # # Begin patch === modified file 'errors/Makefile.am' --- errors/Makefile.am 2008-08-22 13:00:18 +0000 +++ errors/Makefile.am 2008-08-27 05:30:08 +0000 @@ -120,7 +120,7 @@ || 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 @@ fi all: - make translate + $(MAKE) translate
# Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWt+xecAA/PfgAAwfef//3eP HAS////wYAZ99F8gAFmDSRUIlHNMTJk0YTBMTTAJgEMEYEYDmmJkyaMJgmJpgEwCGCMCMBzTEyZN GEwTE0wCYBDBGBGASKFNDU2o0D1PSaNBoaBoDQaHqMjRoIqCEm000EwU2ypmUehpA000AAGQKlEJ ppoNTGkZFHoyGmo9UY1P0U00aMjT1FiA7pTs1eG5VgMbyDPjyL4aS0T0F+47aCKGguplNjC3ndLp C23vpVktmK1d3tOJb1p82pQooV5UH3GUzahCi4Sg1AcWxjJ5/Y21zQP41KFMYa7q0qVcV1sko/kQ 32Ngy3ALLFrGfRy8GPRPTTSqlEnKjPLWed27N+iMeSUMVQglGw1eUkC4zZ6FiUFe+8r7/6me5uOi wyk1SR8Z3onkaUaoe+XKwDC+aqnlop2DStyxEcg5t8oxjGOvk7lb7yF2a4rBooIE4VM4xbXoDKJy RFZhUwrONYVHOaGRxjVKtIiksSTaYtaule1xZm4OxGTa87TfDHDGixNFJSfkmR9NeheeXrSYN7q4 68t2FJdbwrNl8UlijSm2cFuhbLDFno87XIwwnB6NGuOCj/mS5k5vqcNSDsa82fVM6M6KoleC1GTT tWRfC1xb25RpaHYis2MMPBkiq+FrQ2bSzbVFxtaU0zVrWHZMVG7JjDrYxlJpXQ8Yb1xmwNuzTKja sbly1zxVwbN6xXrjg2r31N6xym3qW0zM04bDqdu/jL11yOk9rwWRLI1t69Rx6OtQ6TmcGbesc2Dj xtbFH3SvfunGNRSkbcVV8MWXWyb+DWcNq5O1dN+/JrfU60bMsTCdkkWtMljN17jcoUWN/Je0Lh1M F8Vh4vaa79OuFKc3hKpJc1KylEFUZ561i1VsjDeo1Kw9xoeE4TjZqs7mBcqWZYs2K+5dkWRqZrlr 2tbQqsfYvfjJUg3sqYNaQ2uQcQErExC0eTyj2IXsEDtYLkokpkTCisCiU3mmwgmSYVhgMrYcS51F WVAUrSgoqSwiFSlgMwZgmNhNjQ2zttKssny5fsX2Pmto/cvLX8P2NS+41TF/CvAdG5VSFDj9Ou6i k8fJS1Hk9HN4Pcvd72FXwXvUtwfe/G5YSfDFxceCfCHq9yh8s56r6HOOyaZ6udX9NwY20S50h8u3 thTtVWw4uxayVfg6NL5H6T+b3lPnKKlKqKtCk7nojFi1ttima09oRLSZzHeI1Bc78xckseFRi8oX rNvegO2Y92lEptce1Fsn5zk3Jm7F43rZvaUljvhR1otnsjWy/8jh9PHOV4uDhVNqJRwdC34Zf4uR 2znDaTN6Fup6jglo4LoNLC0mhkz3Fx1lgabaVNI4oli9LcIyPkhAXbnqbevj0nODuHWhzkxhMJLJ 9rIpGnz7nk+L2uKped7mrKx0ZR+jYnk+M4HvRUZSxxRMZSvxklHGfvPNHN1JRFOzzhVExr/c+U8X VC/w8jL/splPSB4C1DwSRtBkOrEhwbO/axaHQg+kyoOx8MVy72zzLHQunfD4TvHvcodEXndjqH2c 1XiL6ivmYO5zO6S9xqdf57jsN61JJvcY2tziaXgnVTMDxCChYkyloQmyWISfgXs0XpRZkVKICwQ7 16KHRcsCQkhH0OfqEhS4HH84inW0I8UMQjWsj2TQze4K3S4nY7HWBOLyYd+iaEpK+ydsDHKdnY9S kxh+U6llB8T0Xhtn8pwZSiLDUiYNNZMOVm8nJoaFEpROhWGdrfC6YJSU4Jy5qRjFYSjQuDabXxEd 2BhAwoeeKGSGfT4wpXcXO5mNh2BnfWzJMsrWFTDVpGI0IciESOZZLOAGliO45H3en5wPB9sx14GM OfKE1zNHGF/LJ+CIhjwLW6GDqIsXiW8/xDKugTC242xsYv/F3JFOFCQa37F5wA==
