Commit 79124a12 authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

Rename spec "pre" files to also include "spec" in the filename.

Some CLEANFILES cleanup (don't need to list files already known
via configure.ac's AC_OUTPUT).

Add b10-xfrout to CLEANFILES to make sure it is removed on a make clean.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1652 e5f2f494-b856-4b98-b285-d166d9295462
parent 61f47f32
......@@ -384,10 +384,10 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/cmdctl/tests/cmdctl_test
src/bin/xfrin/tests/xfrin_test
src/bin/xfrin/xfrin.py
src/bin/xfrin/xfrin.pre
src/bin/xfrin/xfrin.spec.pre
src/bin/xfrin/run_b10-xfrin.sh
src/bin/xfrout/xfrout.py
src/bin/xfrout/xfrout.pre
src/bin/xfrout/xfrout.spec.pre
src/bin/xfrout/tests/xfrout_test
src/bin/xfrout/run_b10-xfrout.sh
src/bin/bind10/bind10.py
......@@ -403,7 +403,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/msgq/msgq.py
src/bin/msgq/msgq_test
src/bin/msgq/run_msgq.sh
src/bin/auth/auth.pre
src/bin/auth/auth.spec.pre
src/bin/auth/spec_config.h
src/lib/config/tests/data_def_unittests_config.h
src/lib/python/isc/config/tests/config_test
......
......@@ -8,7 +8,7 @@ endif
pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = *.gcno *.gcda auth.pre auth.spec
CLEANFILES = *.gcno *.gcda auth.spec
man_MANS = b10-auth.8
EXTRA_DIST = $(man_MANS) b10-auth.xml
......@@ -20,8 +20,8 @@ b10-auth.8: b10-auth.xml
endif
auth.spec: auth.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.pre >$@
auth.spec: auth.spec.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.spec.pre >$@
pkglibexec_PROGRAMS = b10-auth
b10_auth_SOURCES = auth_srv.cc auth_srv.h
......
......@@ -5,7 +5,7 @@ pkglibexec_SCRIPTS = b10-xfrin
b10_xfrindir = $(DESTDIR)$(pkgdatadir)
b10_xfrin_DATA = xfrin.spec
CLEANFILES = b10-xfrin xfrin.pre xfrin.spec
CLEANFILES = b10-xfrin xfrin.spec
man_MANS = b10-xfrin.8
EXTRA_DIST = $(man_MANS) b10-xfrin.xml
......@@ -18,8 +18,8 @@ b10-xfrin.8: b10-xfrin.xml
endif
xfrin.spec: xfrin.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.pre >$@
xfrin.spec: xfrin.spec.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.spec.pre >$@
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
......
......@@ -5,12 +5,12 @@ pkglibexec_SCRIPTS = b10-xfrout
b10_xfroutdir = $(DESTDIR)$(pkgdatadir)
b10_xfrout_DATA = xfrout.spec
CLEANFILES= xfrout.py xfrout.pre xfrout.spec
CLEANFILES= b10-xfrout xfrout.spec
EXTRA_DIST = tests/xfrout_test.py
xfrout.spec: xfrout.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.pre >$@
xfrout.spec: xfrout.spec.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrout.spec.pre >$@
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment