From 5159cd7bc070a4fbf013e6c8c259ccb8ef391b0d Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 17 Mar 2018 21:43:24 -0700 Subject: Adjust the paths to match new stuff location Signed-off-by: Alexey Neyman --- Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index c58c45fd..72df9536 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,14 +9,16 @@ bin_SCRIPTS = ct-ng CLEANFILES = $(bin_SCRIPTS) EXTRA_DIST = ct-ng.in bootstrap -nobase_dist_pkgdata_DATA = $(verbatim_data) +# paths.sh generated by configure +nobase_dist_pkgdata_DATA = $(verbatim_data) paths.sh do_subst = ( @SED@ \ -e 's,[@]bindir[@],$(bindir),g' \ - -e 's,[@]libdir[@],$(libdir),g' \ -e 's,[@]docdir[@],$(docdir),g' \ -e 's,[@]mandir[@],$(mandir),g' \ + -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ + -e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g' \ | $(SHELL) config.status --file=- ) -ct-ng: ct-ng.in - $(AM_V_GEN)$(do_subst) < $< >$@-t && chmod a-w,a+x $@-t && mv $@-t $@ +ct-ng: ct-ng.in Makefile + $(AM_V_GEN)$(do_subst) < $< >$@-t && chmod a-w,a+x $@-t && mv -f $@-t $@ -- cgit v1.2.3