OK, datadir is now ${prefix}/share, which is what it's supposed

[freeradius.git] / Make.inc.in

diff --git a/Make.inc.in b/Make.inc.in
index 0179b24..c96d96f 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -1,5 +1,5 @@
 #
-# Make.inc.in  Common Makefile stuff for the cistron-radius package.
+# Make.inc.in
 #
 # Version:     $Id$
 #
@@ -13,9 +13,13 @@ libdir               = @libdir@
 bindir         = @bindir@
 sbindir                = @sbindir@
 mandir         = @mandir@
+datadir                = @datadir@
+dictdir                = $(datadir)/freeradius
 logdir         = @logdir@
 raddbdir       = @raddbdir@
 radacctdir     = @radacctdir@
+top_builddir   = @top_builddir@
+top_srcdir     = @top_srcdir@
 
 MAKE           = @MAKE@
 CC             = @CC@
@@ -28,18 +32,40 @@ LIBTOOL             = @LIBTOOL@
 ACLOCAL                = @ACLOCAL@
 AUTOCONF       = @AUTOCONF@
 AUTOHEADER     = @AUTOHEADER@
+INSTALL                = ${top_builddir}/install-sh -c
+INSTALL_PROGRAM        = ${INSTALL}
+INSTALL_DATA   = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALLSTRIP   = @INSTALLSTRIP@
 
 LCRYPT         = @CRYPTLIB@
-LDBM           = @DBMLIB@
 LIBS           = @LIBS@
 
-LOGDIR         = @logdir@
-RADDBDIR       = @raddbdir@
-RUNDIR         = @localstatedir@/run
-SBINDIR                = @sbindir@
-RADIR          = @radacctdir@
+LOGDIR         = ${logdir}
+RADDBDIR       = ${raddbdir}
+RUNDIR         = ${localstatedir}/run/radiusd
+SBINDIR                = ${sbindir}
+RADIR          = ${radacctdir}
 
 LIBLTDL                = @LIBLTDL@
+LIBLTDLPATH    = @LIBLTDLPATH@
 INCLTDL                = @INCLTDL@
 
-BUILDDBM       = @BUILDDBM@
+USE_SHARED_LIBS        = @USE_SHARED_LIBS@
+USE_STATIC_LIBS = @USE_STATIC_LIBS@
+STATIC_MODULES = @STATIC_MODULES@
+
+SNMP_INCLUDE   = @SNMP_INCLUDE@
+SNMP_LIBS      = @SNMP_LIBS@
+
+#
+#  SQL driver defines
+#
+SQL_ODBC_LIBS = @ODBC_LIBS@
+SQL_ODBC_INCLUDE = @ODBC_INCLUDE@
+
+RADIUSD_MAJOR_VERSION  = @RADIUSD_MAJOR_VERSION@
+RADIUSD_MINOR_VERSION  = @RADIUSD_MINOR_VERSION@
+RADIUSD_VERSION                = @RADIUSD_VERSION@
+
+MODULES                        = @MODULES@