diff options
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch index a5e554736a..312f44f8eb 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch | |||
| @@ -37,7 +37,7 @@ index d5468be..77fc480 100644 | |||
| 37 | ## $(AR_R) $(TARGLIB) $(LIBOBJS) | 37 | ## $(AR_R) $(TARGLIB) $(LIBOBJS) |
| 38 | 38 | ||
| 39 | -squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* | 39 | -squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* |
| 40 | +squid-conf-tests: /etc/squid.conf.default squidconf/* | 40 | +squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/* |
| 41 | @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ | 41 | @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ |
| 42 | for cfg in $$cfglist ; do \ | 42 | for cfg in $$cfglist ; do \ |
| 43 | - $(top_builddir)/src/squid -k parse -f $$cfg || \ | 43 | - $(top_builddir)/src/squid -k parse -f $$cfg || \ |
| @@ -45,7 +45,7 @@ index d5468be..77fc480 100644 | |||
| 45 | { echo "FAIL: squid.conf test: $$cfg" | \ | 45 | { echo "FAIL: squid.conf test: $$cfg" | \ |
| 46 | - sed s%$(top_builddir)/src/%% | \ | 46 | - sed s%$(top_builddir)/src/%% | \ |
| 47 | - sed s%$(srcdir)/squidconf/%% ; \ | 47 | - sed s%$(srcdir)/squidconf/%% ; \ |
| 48 | + sed s%/etc/%% | \ | 48 | + sed s%$(sysconfdir)/%% | \ |
| 49 | + sed s%squidconf/%% ; \ | 49 | + sed s%squidconf/%% ; \ |
| 50 | failed=1; break; \ | 50 | failed=1; break; \ |
| 51 | }; \ | 51 | }; \ |
| @@ -53,7 +53,7 @@ index d5468be..77fc480 100644 | |||
| 53 | echo "PASS: squid.conf test: $$cfg" | \ | 53 | echo "PASS: squid.conf test: $$cfg" | \ |
| 54 | - sed s%$(top_builddir)/src/%% | \ | 54 | - sed s%$(top_builddir)/src/%% | \ |
| 55 | - sed s%$(srcdir)/squidconf/%% ; \ | 55 | - sed s%$(srcdir)/squidconf/%% ; \ |
| 56 | + sed s%/etc/%% | \ | 56 | + sed s%$(sysconfdir)/%% | \ |
| 57 | + sed s%squidconf/%% ; \ | 57 | + sed s%squidconf/%% ; \ |
| 58 | else break; fi; \ | 58 | else break; fi; \ |
| 59 | done; \ | 59 | done; \ |
