From 8aa04d2ad4754032b4f2aac30651319b7de167dc Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 17 Jul 2001 15:15:31 +0000
Subject: [PATCH] use make-rpath to create rpath argument to ld

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10345 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/auth/sia/Makefile.am | 16 ++++++++--------
 lib/auth/sia/make-rpath  | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100755 lib/auth/sia/make-rpath

diff --git a/lib/auth/sia/Makefile.am b/lib/auth/sia/Makefile.am
index cc9d39bfe..9613bc819 100644
--- a/lib/auth/sia/Makefile.am
+++ b/lib/auth/sia/Makefile.am
@@ -80,11 +80,11 @@ OBJS = sia.o posix_getpw.o
 
 libsia_krb5.so: $(OBJS)
 	@if test -f $(top_builddir)/lib/krb5/.libs/libkrb5.a; then \
-		echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`"; \
-		$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`; \
+		echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`"; \
+		$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`; \
 	elif test -f $(top_builddir)/lib/krb5/.libs/libkrb5.so; then \
-		echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`"; \
-		$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`; \
+		echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`"; \
+		$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`; \
 	else \
 		echo "missing libraries"; exit 1; \
 	fi
@@ -92,11 +92,11 @@ libsia_krb5.so: $(OBJS)
 
 libsia_krb4.so: $(OBJS)
 	@if test -f $(top_builddir)/lib/krb/.libs/libkrb.a; then \
-		echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`"; \
-		$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L) | sed 's,-R,-rpath,g'`; \
+		echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`"; \
+		$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L)`; \
 	elif test -f $(top_builddir)/lib/krb/.libs/libkrb.so; then \
-		echo "$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`"; \
-		$(CC) -shared -o $@ `echo $(LDFLAGS) | sed 's,-R,-rpath,g'` $(OBJS) `echo $(L_shared) | sed 's,-R,-rpath,g'`; \
+		echo "$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`"; \
+		$(CC) -shared -o $@ `$(SHELL) $(srcdir)/make-rpath $(LDFLAGS) $(OBJS) $(L_shared)`; \
 	else \
 		echo "missing libraries"; exit 1; \
 	fi
diff --git a/lib/auth/sia/make-rpath b/lib/auth/sia/make-rpath
new file mode 100755
index 000000000..c34809769
--- /dev/null
+++ b/lib/auth/sia/make-rpath
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $Id$
+rlist=
+rest=
+while test $# -gt 0; do
+case $1 in
+-R|-rpath)
+  if test "$rlist"; then
+    rlist="${rlist}:$2"
+  else
+    rlist="$2"
+  fi
+  shift 2
+  ;;
+-R*) 
+  d=`echo $1 | sed 's,^-R,,'`
+  if test "$rlist"; then
+    rlist="${rlist}:${d}"
+  else
+    rlist="${d}"
+  fi
+  shift
+  ;;
+*)
+  rest="${rest} $1"
+  shift
+  ;;
+esac
+done
+rpath=
+if test "$rlist"; then
+  rpath="-rpath $rlist "
+fi
+echo "${rpath}${rest}"