Tue, 11 Nov 2025 17:02:26 +0100
add DESTDIR support
| make/install-lib-macos.sh | file | annotate | diff | comparison | revisions | |
| make/install-lib.sh | file | annotate | diff | comparison | revisions | |
| make/install-pc-file.sh | file | annotate | diff | comparison | revisions | |
| src/Makefile | file | annotate | diff | comparison | revisions |
--- a/make/install-lib-macos.sh Mon Nov 10 21:56:09 2025 +0100 +++ b/make/install-lib-macos.sh Tue Nov 11 17:02:26 2025 +0100 @@ -1,7 +1,7 @@ #!/bin/sh if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] ; then - echo "Usage: $0 <src> <libdir> <version> <major_version>" + echo "Usage: $0 <src> <libdir> <version> <major_version> [destdir]" exit 1 fi @@ -10,12 +10,13 @@ LIBNAME=${NAME/.dylib/.$4.dylib} SRC="$1" -DST="$2/$LIBNAME" -LN_DST="$2/$NAME" +LIB_ID="$2/$LIBNAME" +DST="$5$2/$LIBNAME" +LN_DST="$5$2/$NAME" cp -f "$SRC" "$DST" -install_name_tool -id "$DST" "$DST" +install_name_tool -id "$LIB_ID" "$DST" rm -f "$LN_DST" ln -s "$LIBNAME" "$LN_DST"
--- a/make/install-lib.sh Mon Nov 10 21:56:09 2025 +0100 +++ b/make/install-lib.sh Tue Nov 11 17:02:26 2025 +0100 @@ -1,13 +1,13 @@ #!/bin/sh if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] || [ -z "$4" ] ; then - echo "Usage: $0 <src> <libdir> <version> <major_version>" + echo "Usage: $0 <src> <libdir> <version> <major_version> [destdir]" exit 1 fi SRC=$1 LIB=$(basename $1) -LIBDIR=$2 +LIBDIR=$5$2 LIBVERSION=$3 LIBVERSION_MAJOR=$4
--- a/make/install-pc-file.sh Mon Nov 10 21:56:09 2025 +0100 +++ b/make/install-pc-file.sh Tue Nov 11 17:02:26 2025 +0100 @@ -1,15 +1,16 @@ #!/bin/sh if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ] ; then - echo "Illegal use." + echo "Usage: $0 <version> <libdir> <includedir> [destdir]" exit 1 fi version="$1" libdir="$2" includedir="$3" +destdir="$4" -cat << EOF > "$libdir/pkgconfig/ucx.pc" +cat << EOF > "$destdir$libdir/pkgconfig/ucx.pc" libdir=$libdir includedir=$includedir
--- a/src/Makefile Mon Nov 10 21:56:09 2025 +0100 +++ b/src/Makefile Tue Nov 11 17:02:26 2025 +0100 @@ -58,13 +58,13 @@ then : ; else cd $(root_dir); $(MAKE) compile; fi install: rebuild_if_missing - $(MKDIR) $(libdir) $(includedir)/cx $(libdir)/pkgconfig - $(RMFILE) $(libdir)/libucx$(SHLIB_EXT).$(LIBVERSION_MAJOR) - $(RMFILE) $(libdir)/libucx$(SHLIB_EXT) - $(COPYFILE) $(build_dir)/libucx_static$(STLIB_EXT) $(libdir)/libucx_static$(STLIB_EXT) - $(INSTALL_LIB) $(build_dir)/libucx$(SHLIB_EXT) $(libdir) $(LIBVERSION) $(LIBVERSION_MAJOR) - $(COPYALL) $(root_dir)/src/cx $(includedir) - $(SHELL) $(root_dir)/make/install-pc-file.sh "$(VERSION)" "$(libdir)" "$(includedir)" + $(MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/cx $(DESTDIR)$(libdir)/pkgconfig + $(RMFILE) $(DESTDIR)$(libdir)/libucx$(SHLIB_EXT).$(LIBVERSION_MAJOR) + $(RMFILE) $(DESTDIR)$(libdir)/libucx$(SHLIB_EXT) + $(COPYFILE) $(build_dir)/libucx_static$(STLIB_EXT) $(DESTDIR)$(libdir)/libucx_static$(STLIB_EXT) + $(SHELL) "$(INSTALL_LIB)" "$(build_dir)/libucx$(SHLIB_EXT)" "$(libdir)" $(LIBVERSION) $(LIBVERSION_MAJOR) "$(DESTDIR)" + $(COPYALL) $(root_dir)/src/cx $(DESTDIR)$(includedir) + $(SHELL) "$(root_dir)/make/install-pc-file.sh" "$(VERSION)" "$(libdir)" "$(includedir)" "$(DESTDIR)" FORCE: