------------------------------------------------------------ revno: 13411 revision-id: kinkie@squid-cache.org-20140512160258-qqdv0s8iyxcbifu4 parent: squid3@treenet.co.nz-20140512124912-2ts0mfchf9vdvn1g committer: Francesco Chemolli branch nick: trunk timestamp: Mon 2014-05-12 18:02:58 +0200 message: Reverted r13409 due to incompatibility with BSD pmake ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20140512160258-qqdv0s8iyxcbifu4 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 724dc0d69412d99fd8156170704319662f60d2bb # timestamp: 2014-05-12 16:54:03 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140512124912-\ # 2ts0mfchf9vdvn1g # # Begin patch === modified file 'src/Common.am' --- src/Common.am 2014-05-12 09:42:30 +0000 +++ src/Common.am 2014-05-12 16:02:58 +0000 @@ -46,4 +46,4 @@ COMPAT_LIB = $(top_builddir)/compat/libcompat-squid.la $(LIBPROFILER) ## Some helpers are written in Perl and need the local shell defined properly -subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$< >$@ || ($(RM) -f $@ ; exit 1) +subst_perlshell = sed -e 's,[@]PERL[@],$(PERL),g' <$(srcdir)/$@.pl.in >$@ || ($(RM) -f $@ ; exit 1)