restore default paths for FreeBSD (reported by alphaque, fixed by jcollie)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@30458 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
6d7eb1ed13
commit
9f9309cda6
10
Makefile
10
Makefile
|
@ -95,14 +95,18 @@ ifeq ($(OSARCH),SunOS)
|
|||
else
|
||||
ASTETCDIR=$(sysconfdir)/asterisk
|
||||
ASTLIBDIR=$(libdir)/asterisk
|
||||
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
|
||||
ASTSPOOLDIR=$(localstatedir)/spool/asterisk
|
||||
ASTLOGDIR=$(localstatedir)/log/asterisk
|
||||
ASTHEADERDIR=$(includedir)/asterisk
|
||||
ASTBINDIR=$(bindir)
|
||||
ASTSBINDIR=$(sbindir)
|
||||
ASTSPOOLDIR=$(localstatedir)/spool/asterisk
|
||||
ASTLOGDIR=$(localstatedir)/log/asterisk
|
||||
ASTVARRUNDIR=$(localstatedir)/run
|
||||
ASTMANDIR=$(mandir)
|
||||
ifeq ($(OSARCH),FreeBSD)
|
||||
ASTVARLIBDIR=$(prefix)/share/asterisk
|
||||
else
|
||||
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
|
||||
endif
|
||||
endif
|
||||
ASTDATADIR?=$(ASTVARLIBDIR)
|
||||
|
||||
|
|
16
configure.ac
16
configure.ac
|
@ -28,19 +28,17 @@ case "${host}" in
|
|||
;;
|
||||
*)
|
||||
ac_default_prefix=/usr
|
||||
if test ${sysconfdir} = '${prefix}/etc'; then
|
||||
sysconfdir=/etc
|
||||
fi
|
||||
if test ${mandir} = '${prefix}/man'; then
|
||||
mandir=/usr/share/man
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if test ${sysconfdir} = '${prefix}/etc'; then
|
||||
sysconfdir=/etc
|
||||
fi
|
||||
|
||||
if test ${localstatedir} = '${prefix}/var'; then
|
||||
localstatedir=/var
|
||||
fi
|
||||
|
||||
if test ${mandir} = '${prefix}/man'; then
|
||||
mandir=/usr/share/man
|
||||
localstatedir=/var
|
||||
fi
|
||||
|
||||
### ** Platform.
|
||||
|
|
Reference in New Issue