This commit is contained in:
Akira TAGOH 2013-09-26 18:44:10 +09:00
parent 43f768b53f
commit 96c5f3cf0f
2 changed files with 2 additions and 6 deletions

View File

@ -45,7 +45,7 @@ CONF_LINKS = \
EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
CLEANFILES = $(DOC_FILES) CLEANFILES = $(DOC_FILES)
configdir=$(CONFIGDIR) configdir = $(CONFIGDIR)
config_DATA = $(DOC_FILES) config_DATA = $(DOC_FILES)
templatedir = $(TEMPLATEDIR) templatedir = $(TEMPLATEDIR)

View File

@ -588,7 +588,7 @@ no|yes)
esac esac
case "$configdir" in case "$configdir" in
no|yes) no|yes)
configdir='${baseconfigdir}'/conf.d configdir='${BASECONFIGDIR}'/conf.d
;; ;;
*) *)
;; ;;
@ -605,13 +605,9 @@ TEMPLATEDIR=${templatedir}
BASECONFIGDIR=${baseconfigdir} BASECONFIGDIR=${baseconfigdir}
CONFIGDIR=${configdir} CONFIGDIR=${configdir}
XMLDIR=${xmldir} XMLDIR=${xmldir}
AC_SUBST(templatedir)
AC_SUBST(TEMPLATEDIR) AC_SUBST(TEMPLATEDIR)
AC_SUBST(baseconfigdir)
AC_SUBST(BASECONFIGDIR) AC_SUBST(BASECONFIGDIR)
AC_SUBST(configdir)
AC_SUBST(CONFIGDIR) AC_SUBST(CONFIGDIR)
AC_SUBST(xmldir)
AC_SUBST(XMLDIR) AC_SUBST(XMLDIR)