From 1d5f9b562d10f6561a993da49593236591c8c38c Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 26 Feb 2016 22:01:57 +0900 Subject: [PATCH] Fix build error - Install error at aarch64 Change-Id: Id11321d5094de415ec743c18ad6b3629b0e0ed78 Signed-off-by: DongHun Kwak --- Makefile.pre.in | 14 +++++++------- configure | 3 ++- configure.ac | 3 ++- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index e19fc00b..809e1c77 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -120,7 +120,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= @libdir@ ABIFLAGS= @ABIFLAGS@ # Detailed destination directories @@ -1418,12 +1418,12 @@ frameworkinstallstructure: $(LDLIBRARY) # Install a number of symlinks to keep software that expects a normal unix # install (which includes python-config) happy. frameworkinstallmaclib: - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).a" - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).dylib" - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).a" - $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).dylib" - $(LN) -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(LDVERSION).dylib" - $(LN) -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(prefix)/lib/libpython$(VERSION).dylib" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).a" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/python$(VERSION)/config-$(LDVERSION)/libpython$(LDVERSION).dylib" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).a" + $(LN) -fs "../../../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/python$(VERSION)/config-$(LDVERSION)/libpython$(VERSION).dylib" + $(LN) -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/libpython$(LDVERSION).dylib" + $(LN) -fs "../$(PYTHONFRAMEWORK)" "$(DESTDIR)$(LIBPL)/libpython$(VERSION).dylib" # This installs the IDE, the Launcher and other apps into /Applications frameworkinstallapps: diff --git a/configure b/configure index 7b91f914..8f878806 100755 --- a/configure +++ b/configure @@ -14030,7 +14030,8 @@ LDVERSION='$(VERSION)$(ABIFLAGS)' $as_echo "$LDVERSION" >&6; } -LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +#LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" # Check whether right shifting a negative integer extends the sign bit diff --git a/configure.ac b/configure.ac index 3394d84c..31ad3c08 100644 --- a/configure.ac +++ b/configure.ac @@ -4115,7 +4115,8 @@ AC_MSG_RESULT($LDVERSION) dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) -LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +#LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}" +LIBPL='$(LIBDIR)'"/python${VERSION}/config-${LDVERSION}" AC_SUBST(LIBPL) # Check whether right shifting a negative integer extends the sign bit -- 2.34.1