diff --git a/lib/auth/afskauthlib/Makefile.in b/lib/auth/afskauthlib/Makefile.in
index 324a76395..37a9ea7a2 100644
--- a/lib/auth/afskauthlib/Makefile.in
+++ b/lib/auth/afskauthlib/Makefile.in
@@ -23,7 +23,6 @@ exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @REAL_PICFLAGS@
-SHARED = @SHARED@
 LDSHARED = @LDSHARED@
 SHLIBEXT = @REAL_SHLIBEXT@
 LD_FLAGS = @REAL_LD_FLAGS@
@@ -76,4 +75,4 @@ $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) $(SHARED) -o $@ $(OBJECTS) -rpath,$(libdir) -L../../kafs -lkafs -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken
+	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -lkafs -L../../krb -lkrb -L../../des -ldes -L../../roken -lroken
diff --git a/lib/auth/pam/Makefile.in b/lib/auth/pam/Makefile.in
index 11e4a37e6..af5121567 100644
--- a/lib/auth/pam/Makefile.in
+++ b/lib/auth/pam/Makefile.in
@@ -22,7 +22,6 @@ exec_prefix = @exec_prefix@
 libdir = @libdir@
 
 PICFLAGS = @REAL_PICFLAGS@
-SHARED = @SHARED@
 LDSHARED = @LDSHARED@
 SHLIBEXT = @REAL_SHLIBEXT@
 LD_FLAGS = @REAL_LD_FLAGS@
@@ -76,5 +75,5 @@ $(OBJECTS): ../../../include/config.h
 
 $(LIB): $(OBJECTS)
 	rm -f $@
-	$(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -L../../krb -L../../des -L../../roken -lkafs -lkrb -ldes -lroken
+	$(LDSHARED) -o $@ $(OBJECTS) $(LD_FLAGS) -L../../kafs -L../../krb -L../../des -L../../roken -lkafs -lkrb -ldes -lroken
 #	$(CC) -shared -Wl,-x -o $(LIB) $(OBJECTS)  ../../kafs/libkafs.a ../../krb/libkrb.a ../../des/libdes.a
diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index 07904cce0..a1c91d27d 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -39,7 +39,6 @@ LIBNAME = $(LIBPREFIX)des
 LIBEXT = @LIBEXT@
 LIBPREFIX = @LIBPREFIX@
 SHLIBEXT = @SHLIBEXT@
-SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 
 # Generated with lorder *.o | tsort | xargs echo
@@ -107,7 +106,7 @@ $(LIBNAME).a: $(LIBOBJ)
 
 $(LIBNAME).$(SHLIBEXT): $(LIBOBJ)
 	rm -f $@
-	$(LDSHARED) $(SHARED) -o $@ $(LIBOBJ)
+	$(LDSHARED) -o $@ $(LIBOBJ)
 
 # To make psoriaris make happy we have to mention these files in some
 # rule, so we might as well put them here.
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index 4a31ac9c6..77ad638e7 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -27,7 +27,6 @@ LIBNAME = $(LIBPREFIX)editline
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
 LIBPREFIX = @LIBPREFIX@
-SHARED = @SHARED@
 LDSHARED = @LDSHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 
@@ -79,6 +78,6 @@ $(LIBNAME).a: $(OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) $(SHARED) -o $@ $(OBJECTS)
+	$(LDSHARED) -o $@ $(OBJECTS)
 
 $(OBJECTS): ../../include/config.h
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index cf2d97261..411f379cf 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -27,7 +27,6 @@ LIBNAME = $(LIBPREFIX)kafs
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
 LIBPREFIX = @LIBPREFIX@
-SHARED = @SHARED@
 LDSHARED = @LDSHARED@
 AFS_EXTRA_LIBS	= @AFS_EXTRA_LIBS@
 LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
@@ -81,7 +80,7 @@ $(LIBNAME).a: $(OBJECTS) @AFS_EXTRA_OBJS@
 
 $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	rm -f $@
-	$(LDSHARED) $(SHARED) -o $@ $(OBJECTS)
+	$(LDSHARED) -o $@ $(OBJECTS)
 
 # AIX: this almost works with gcc, but somehow it fails to use the
 # correct ld, use ld instead
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index 3d9566e40..aed67b849 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -29,7 +29,6 @@ LIBNAME = $(LIBPREFIX)otp
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
 LIBPREFIX = @LIBPREFIX@
-SHARED = @SHARED@
 LDSHARED = @LDSHARED@
 EXECSUFFIX=@EXECSUFFIX@
 LIB = $(LIBNAME).$(LIBEXT)
@@ -92,7 +91,7 @@ $(LIBNAME).a: $(LIB_OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
 	rm -f $@
-	$(LDSHARED) $(SHARED) -o $@ $(LIB_OBJECTS)
+	$(LDSHARED) -o $@ $(LIB_OBJECTS)
 
 $(OBJECTS): ../../include/config.h
 
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index 79ce11dc6..ed92e43b8 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -29,7 +29,7 @@ LIBNAME = $(LIBPREFIX)roken
 LIBEXT = a
 LIBPREFIX = @LIBPREFIX@
 SHLIBEXT = @SHLIBEXT@
-SHARED = @SHARED@
+LDSHARED = @LDSHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 
 SOURCES = \
@@ -89,6 +89,6 @@ $(LIBNAME).a: $(OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(OBJECTS)
 	rm -f $@
-	$(CC) $(CFLAGS) $(PICFLAGS) $(SHARED) -o $@ $(OBJECTS)
+	$(LDSHARED) -o $@ $(OBJECTS)
 
 $(OBJECTS): ../../include/config.h
diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in
index b9e1cc85f..dfd34cf28 100644
--- a/lib/sl/Makefile.in
+++ b/lib/sl/Makefile.in
@@ -27,7 +27,6 @@ LIBNAME = $(LIBPREFIX)sl
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
 LIBPREFIX = @LIBPREFIX@
-SHARED = @SHARED@
 LDSHARED = @LDSHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 PROGS =
@@ -78,7 +77,7 @@ $(LIBNAME).a: $(LIB_OBJECTS)
 
 $(LIBNAME).$(SHLIBEXT): $(LIB_OBJECTS)
 	rm -f $@
-	$(LDSHARED) $(SHARED) -o $@ $(LIB_OBJECTS)
+	$(LDSHARED) -o $@ $(LIB_OBJECTS)
 
 $(OBJECTS): ../../include/config.h