diff options
| author | Akira TAGOH <akira@tagoh.org> | 2013-09-26 18:44:10 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2013-09-26 18:44:10 +0900 |
| commit | 96c5f3cf0ff57e7bbb08cc1e0e78ed0542096484 (patch) | |
| tree | 9beed1556125cfb1f2efd10d027ad16971cc0aa9 | |
| parent | 43f768b53f554cf0f927ccac5daf96877f9fc69c (diff) | |
clean up
| -rw-r--r-- | conf.d/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index e1fab506..d61756b8 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 952e7376..4b631bd5 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) |