From 23a3d0ea9b842af6571f349a316e6f833e9273de Mon Sep 17 00:00:00 2001 From: cierny Date: Mon, 2 Jun 2025 16:15:41 -0700 Subject: Use relative paths in linking step --- crypto/Makefile.am | 6 +++--- ssl/Makefile.am | 2 +- tls/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 5a3f496..1c67489 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -56,13 +56,13 @@ crypto_portable.sym: crypto.sym Makefile libcrypto_la_objects.mk: Makefile @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ - | sed 's/ */ $$\(abs_top_builddir\)\/crypto\//g' \ + | sed 's/ */ $$\(top_srcdir\)\/crypto\//g' \ > libcrypto_la_objects.mk @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ - | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \ + | sed 's/compat\// $$\(top_srcdir\)\/crypto\/&/g' \ >> libcrypto_la_objects.mk @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ - | sed 's/compat\// $$\(abs_top_builddir\)\/crypto\/&/g' \ + | sed 's/compat\// $$\(top_srcdir\)\/crypto\/&/g' \ >> libcrypto_la_objects.mk libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 2c84bff..f10b325 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -26,7 +26,7 @@ EXTRA_libssl_la_DEPENDENCIES = libssl_la_objects.mk libssl_la_objects.mk: Makefile @echo "libssl_la_objects= $(libssl_la_OBJECTS)" \ - | sed 's/ */ $$\(abs_top_builddir\)\/ssl\//g' \ + | sed 's/ */ $$\(top_srcdir\)\/ssl\//g' \ > libssl_la_objects.mk .PHONY: remove_bs_objects diff --git a/tls/Makefile.am b/tls/Makefile.am index 22f3222..eceddf8 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am @@ -16,7 +16,7 @@ EXTRA_libtls_la_DEPENDENCIES = libtls_la_objects.mk libtls_la_objects.mk: Makefile @echo "libtls_la_objects= $(libtls_la_OBJECTS)" \ - | sed -e 's/ *$$//' -e 's/ */ $$\(abs_top_builddir\)\/tls\//g' \ + | sed -e 's/ *$$//' -e 's/ */ $$\(top_srcdir\)\/tls\//g' \ > libtls_la_objects.mk libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym -- cgit v1.2.3-55-g6feb From e95c54d54c215dceda5f43266a07d1296cea4ab8 Mon Sep 17 00:00:00 2001 From: cierny Date: Mon, 2 Jun 2025 18:42:46 -0700 Subject: Switch to top_builddir --- crypto/Makefile.am | 6 +++--- ssl/Makefile.am | 2 +- tls/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 1c67489..0142e1f 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -56,13 +56,13 @@ crypto_portable.sym: crypto.sym Makefile libcrypto_la_objects.mk: Makefile @echo "libcrypto_la_objects= $(libcrypto_la_OBJECTS)" \ - | sed 's/ */ $$\(top_srcdir\)\/crypto\//g' \ + | sed 's/ */ $$\(top_builddir\)\/crypto\//g' \ > libcrypto_la_objects.mk @echo "libcompat_la_objects= $(libcompat_la_OBJECTS)" \ - | sed 's/compat\// $$\(top_srcdir\)\/crypto\/&/g' \ + | sed 's/compat\// $$\(top_builddir\)\/crypto\/&/g' \ >> libcrypto_la_objects.mk @echo "libcompatnoopt_la_objects= $(libcompatnoopt_la_OBJECTS)" \ - | sed 's/compat\// $$\(top_srcdir\)\/crypto\/&/g' \ + | sed 's/compat\// $$\(top_builddir\)\/crypto\/&/g' \ >> libcrypto_la_objects.mk libcrypto_la_LDFLAGS = -version-info @LIBCRYPTO_VERSION@ -no-undefined -export-symbols crypto_portable.sym diff --git a/ssl/Makefile.am b/ssl/Makefile.am index f10b325..4031dde 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -26,7 +26,7 @@ EXTRA_libssl_la_DEPENDENCIES = libssl_la_objects.mk libssl_la_objects.mk: Makefile @echo "libssl_la_objects= $(libssl_la_OBJECTS)" \ - | sed 's/ */ $$\(top_srcdir\)\/ssl\//g' \ + | sed 's/ */ $$\(top_builddir\)\/ssl\//g' \ > libssl_la_objects.mk .PHONY: remove_bs_objects diff --git a/tls/Makefile.am b/tls/Makefile.am index eceddf8..7c43579 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am @@ -16,7 +16,7 @@ EXTRA_libtls_la_DEPENDENCIES = libtls_la_objects.mk libtls_la_objects.mk: Makefile @echo "libtls_la_objects= $(libtls_la_OBJECTS)" \ - | sed -e 's/ *$$//' -e 's/ */ $$\(top_srcdir\)\/tls\//g' \ + | sed -e 's/ *$$//' -e 's/ */ $$\(top_builddir\)\/tls\//g' \ > libtls_la_objects.mk libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym -- cgit v1.2.3-55-g6feb