From 76e8815fc13aa2b08cc3cee468915fd61e56d60e Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 5 May 2010 20:48:15 +0000 Subject: 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 --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f01ddfb73..f47fcd948 100644 --- a/Makefile +++ b/Makefile @@ -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 ;\ -- cgit v1.2.3