diff options
| author | Alexey Neyman <stilor@att.net> | 2018-03-17 21:43:24 -0700 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2018-04-07 12:03:17 -0700 |
| commit | 5159cd7bc070a4fbf013e6c8c259ccb8ef391b0d (patch) | |
| tree | 99d9914cb726d158649883870c9f929edb7fe880 | |
| parent | 5b95b81ea90682c124d5280b64a91a249c464ee4 (diff) | |
| download | crosstool-ng-5159cd7bc070a4fbf013e6c8c259ccb8ef391b0d.tar.gz crosstool-ng-5159cd7bc070a4fbf013e6c8c259ccb8ef391b0d.tar.bz2 crosstool-ng-5159cd7bc070a4fbf013e6c8c259ccb8ef391b0d.zip | |
Adjust the paths to match new stuff location
Signed-off-by: Alexey Neyman <stilor@att.net>
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | ct-ng.in | 10 |
2 files changed, 11 insertions, 9 deletions
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 $@ @@ -16,7 +16,8 @@ export CT_TOP_DIR:=$(shell pwd) # Paths and values set by ./configure # Don't bother to change it other than with a new ./configure! -export CT_LIB_DIR:=@libdir@ +export CT_LIB_DIR:=@pkgdatadir@ +export CT_LIBEXEC_DIR:=@pkglibexecdir@ export CT_DOC_DIR:=@docdir@ # This is crosstool-NG version string @@ -84,9 +85,9 @@ FORCE: export KCONFIG_TOP = $(CT_LIB_DIR)/config/config.in # We need CONF for savedefconfig in scripts/saveSample.sh -export CONF := $(CT_LIB_DIR)/kconfig/conf -MCONF := $(CT_LIB_DIR)/kconfig/mconf -NCONF := $(CT_LIB_DIR)/kconfig/nconf +export CONF := $(CT_LIBEXEC_DIR)/conf +MCONF := $(CT_LIBEXEC_DIR)/mconf +NCONF := $(CT_LIBEXEC_DIR)/nconf # Used by conf/mconf/nconf to find the .in files # TBD needed? We do supply the defconfig name explicitly below @@ -182,7 +183,6 @@ help-clean:: @echo ' clean - Remove generated files' @echo ' distclean - Remove generated files, configuration and build directories' -include $(CT_LIB_DIR)/steps.mk include $(CT_LIB_DIR)/samples/samples.mk include $(CT_LIB_DIR)/scripts/scripts.mk |