From 96c5f3cf0ff57e7bbb08cc1e0e78ed0542096484 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 26 Sep 2013 18:44:10 +0900 Subject: [PATCH] clean up --- conf.d/Makefile.am | 2 +- configure.ac | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index e1fab50..d61756b 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am @@ -45,7 +45,7 @@ CONF_LINKS = \ EXTRA_DIST = $(template_DATA) $(DOC_SOURCES) CLEANFILES = $(DOC_FILES) -configdir=$(CONFIGDIR) +configdir = $(CONFIGDIR) config_DATA = $(DOC_FILES) templatedir = $(TEMPLATEDIR) diff --git a/configure.ac b/configure.ac index 952e737..4b631bd 100644 --- a/configure.ac +++ b/configure.ac @@ -588,7 +588,7 @@ no|yes) esac case "$configdir" in no|yes) - configdir='${baseconfigdir}'/conf.d + configdir='${BASECONFIGDIR}'/conf.d ;; *) ;; @@ -605,13 +605,9 @@ TEMPLATEDIR=${templatedir} BASECONFIGDIR=${baseconfigdir} CONFIGDIR=${configdir} XMLDIR=${xmldir} -AC_SUBST(templatedir) AC_SUBST(TEMPLATEDIR) -AC_SUBST(baseconfigdir) AC_SUBST(BASECONFIGDIR) -AC_SUBST(configdir) AC_SUBST(CONFIGDIR) -AC_SUBST(xmldir) AC_SUBST(XMLDIR)