diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-05 20:48:15 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-05 20:48:15 +0000 |
| commit | 76e8815fc13aa2b08cc3cee468915fd61e56d60e (patch) | |
| tree | fa4252b6624755b8c8663ed610fe4c4d67649112 /Makefile | |
| parent | 2bf2f0e0d01a45a25230eafb06d1976b653cc12d (diff) | |
Restore previous asterisk.conf syntax, where the directories aren't commented out.
This fixes some breakage in the test suite, that uses the contents of asterisk.conf
to discover the install layout on the system.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@261364 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -705,16 +705,16 @@ samples: adsi if [ "$(OVERWRITE)" = "y" ]; then \ echo "Updating asterisk.conf"; \ sed \ - -e 's|^;astetcdir.*$$|;astetcdir => $(ASTETCDIR)|' \ - -e 's|^;astmoddir.*$$|;astmoddir => $(MODULES_DIR)|' \ - -e 's|^;astvarlibdir.*$$|;astvarlibdir => $(ASTVARLIBDIR)|' \ - -e 's|^;astdbdir.*$$|;astdbdir => $(ASTDBDIR)|' \ - -e 's|^;astkeydir.*$$|;astkeydir => $(ASTKEYDIR)|' \ - -e 's|^;astdatadir.*$$|;astdatadir => $(ASTDATADIR)|' \ - -e 's|^;astagidir.*$$|;astagidir => $(AGI_DIR)|' \ - -e 's|^;astspooldir.*$$|;astspooldir => $(ASTSPOOLDIR)|' \ - -e 's|^;astrundir.*$$|;astrundir => $(ASTVARRUNDIR)|' \ - -e 's|^;astlogdir.*$$|;astlogdir => $(ASTLOGDIR)|' \ + -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ + -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ + -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ + -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ + -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ + -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ + -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ + -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ + -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ + -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ $(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp \ && mv $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH); \ fi ;\ |