From e7b6030bd03ac446bdd86ca908f6f6fb539edeef Mon Sep 17 00:00:00 2001 From: David Mulder Date: Tue, 24 Mar 2020 10:40:14 -0600 Subject: [PATCH] Use absolute paths during build --- configure.ac | 18 +++++++++--------- src/Makefile.am | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index a74fa42..f590924 100644 --- a/configure.ac +++ b/configure.ac @@ -4,18 +4,18 @@ AM_INIT_AUTOMAKE AC_CONFIG_FILES([src/Makefile src/clients/Makefile]) AC_DEFINE(PREFIX, $(prefix)) AC_DEFINE(LIBDIR, $(libdir)) -export PATH=$PATH:..:../yast-devtools/build-tools/doxygen +export PATH=$PATH:${ac_abs_confdir}/src:${ac_abs_confdir}/src/yast-devtools/build-tools/doxygen ln -fs ../configure src/libyui/configure ln -fs ./buildtools/CMakeLists.common src/libyui/CMakeLists.txt ln -fs ../configure src/libyui-ncurses/configure ln -fs ../libyui/buildtools/CMakeLists.common src/libyui-ncurses/CMakeLists.txt -pushd src/yast-core; PKG_CONFIG_PATH=.. make -f Makefile.cvs all; popd -sed -i 's;SET( BUILDTOOLS_DIR .* );SET( BUILDTOOLS_DIR "../libyui/buildtools" );g' src/libyui/buildtools/CMakeLists.common -AX_SUBDIRS_CONFIGURE([src/yast-core, src/libyui], [PKG_CONFIG_PATH=..]) -AX_SUBDIRS_CONFIGURE([src/libyui-ncurses], [CXXFLAGS="-I../..", -DCMAKE_MODULE_PATH=../libyui/buildtools]) -pushd src/yast-ycp-ui-bindings; PKG_CONFIG_PATH=.. make -f Makefile.cvs all; popd +pushd src/yast-core; PKG_CONFIG_PATH=${ac_abs_confdir}/src make -f Makefile.cvs all; popd +sed -i 's;SET( BUILDTOOLS_DIR .* );SET( BUILDTOOLS_DIR "'${ac_abs_confdir}'/src/libyui/buildtools" );g' src/libyui/buildtools/CMakeLists.common +AX_SUBDIRS_CONFIGURE([src/yast-core, src/libyui], [PKG_CONFIG_PATH=${ac_abs_confdir}/src]) +AX_SUBDIRS_CONFIGURE([src/libyui-ncurses], [CXXFLAGS="-I${ac_abs_confdir}/src", -DCMAKE_MODULE_PATH=${ac_abs_confdir}/src/libyui/buildtools]) +pushd src/yast-ycp-ui-bindings; PKG_CONFIG_PATH=${ac_abs_confdir}/src make -f Makefile.cvs all; popd ln -fs libyui/src src/yui -AX_SUBDIRS_CONFIGURE([src/yast-ycp-ui-bindings], [PKG_CONFIG_PATH=$PKG_CONFIG_PATH:.., CPPFLAGS="-I..\ -I../..\ -I../../yast-core/libscr/src/include\ -I../../yast-core/liby2/src/include\ -I../../yast-core/liby2util-r/src/include\ -I../../yast-core/libycp/src/include", LDFLAGS="-L../../ycp-ui\ -L../../wfm\ -L../../yast-core/libscr/src\ -L../../yast-core/liby2/src\ -L../../yast-core/liby2util-r/src\ -L../../yast-core/libycp/src\ -L../../libyui/src"]) -pushd src/yast-python-bindings; PKG_CONFIG_PATH=.. make -f Makefile.cvs all; popd -AX_SUBDIRS_CONFIGURE([src/yast-python-bindings], [PKG_CONFIG_PATH=$PKG_CONFIG_PATH:.., CPPFLAGS="-I..\ -I../..\ -I../../yast-core/libscr/src/include\ -I../../yast-core/liby2/src/include\ -I../../yast-core/liby2util-r/src/include\ -I../../yast-core/libycp/src/include", LDFLAGS="-L../../ycp-ui\ -L../../wfm\ -L../../yast-core/libscr/src\ -L../../yast-core/liby2/src\ -L../../yast-core/liby2util-r/src\ -L../../yast-core/libycp/src", --enable-python3]) +AX_SUBDIRS_CONFIGURE([src/yast-ycp-ui-bindings], [PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${ac_abs_confdir}/src, CPPFLAGS="-I${ac_abs_confdir}/src\ -I${ac_abs_confdir}/src/yast-core/libscr/src/include\ -I${ac_abs_confdir}/src/yast-core/liby2/src/include\ -I${ac_abs_confdir}/src/yast-core/liby2util-r/src/include\ -I${ac_abs_confdir}/src/yast-core/libycp/src/include", LDFLAGS="-L${ac_abs_confdir}/src/ycp-ui\ -L${ac_abs_confdir}/src/wfm\ -L${ac_abs_confdir}/src/yast-core/libscr/src\ -L${ac_abs_confdir}/src/yast-core/liby2/src\ -L${ac_abs_confdir}/src/yast-core/liby2util-r/src\ -L${ac_abs_confdir}/src/yast-core/libycp/src\ -L${ac_abs_confdir}/src/libyui/src"]) +pushd src/yast-python-bindings; PKG_CONFIG_PATH=${ac_abs_confdir}/src make -f Makefile.cvs all; popd +AX_SUBDIRS_CONFIGURE([src/yast-python-bindings], [PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${ac_abs_confdir}/src, CPPFLAGS="-I${ac_abs_confdir}/src\ -I${ac_abs_confdir}/src/yast-core/libscr/src/include\ -I${ac_abs_confdir}/src/yast-core/liby2/src/include\ -I${ac_abs_confdir}/src/yast-core/liby2util-r/src/include\ -I${ac_abs_confdir}/src/yast-core/libycp/src/include", LDFLAGS="-L${ac_abs_confdir}/src/ycp-ui\ -L${ac_abs_confdir}/src/wfm\ -L${ac_abs_confdir}/src/yast-core/libscr/src\ -L${ac_abs_confdir}/src/yast-core/liby2/src\ -L${ac_abs_confdir}/src/yast-core/liby2util-r/src\ -L${ac_abs_confdir}/src/yast-core/libycp/src", --enable-python3]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 974be06..1c9f5eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ all: yast-ycp-ui-bindings yast-python-bindings yast-ruby-bindings yast-ycp-ui-bindings: ln -fs $(srcdir)/libyui/src yui ln -fs $(srcdir)/yast-core/wfm/src wfm - pushd $@; $(MAKE) DEVTOOLSBINDIR=../../yast-core/base/tools/devtools; popd + pushd $@; $(MAKE) DEVTOOLSBINDIR=$(abs_top_srcdir)/src/yast-core/base/tools/devtools; popd yast-python-bindings: ln -fs $(srcdir)/yast-ycp-ui-bindings/src ycp-ui @@ -16,7 +16,7 @@ yast-python-bindings: yast-ruby-bindings: ln -fs $(srcdir)/yast-core/scr/src $(srcdir)/scr - pushd $@; cmake -DCMAKE_CXX_FLAGS="-I../../../yast-core/liby2util-r/src/include -I../../../yast-core/libycp/src/include -I../../../yast-core/libscr/src/include -I../../.." -DCMAKE_PREFIX_PATH=../ -DCMAKE_INSTALL_PREFIX=$(prefix) CMakeLists.txt && $(MAKE) --trace; popd + pushd $@; cmake -DCMAKE_CXX_FLAGS="-I$(abs_top_srcdir)/src/yast-core/liby2util-r/src/include -I$(abs_top_srcdir)/src/yast-core/libycp/src/include -I$(abs_top_srcdir)/src/yast-core/libscr/src/include -I$(abs_top_srcdir)/src" -DCMAKE_PREFIX_PATH=$(abs_top_srcdir)/src/ -DCMAKE_INSTALL_PREFIX=$(prefix) CMakeLists.txt && $(MAKE) --trace; popd clean-local: pushd yast-ycp-ui-bindings; $(MAKE) clean; popd