--- makefile	2011-01-16 08:51:17.000000000 +0100
+++ makefile_new	2013-06-04 20:17:53.675650152 +0200
@@ -18,7 +18,7 @@
 #AR= echo
 
 # Unix, generally
-CC = gcc -fpic
+CC = $(CC)
 DEBUG=-g -Wall -Wno-char-subscripts -O
 Osuf=o
 SOsuf=so
@@ -27,11 +27,11 @@
 LIBPREFIX=lib
 OUT = -o $@
 RM= -rm -f
-AR= ar crs
+AR= $(AR)
+ARFLAGS = crs
 
 # Linux
-LD = gcc
-LDFLAGS = -shared
+LD = $(CC)
 DEBUG=-g -Wno-char-subscripts -O
 SYS_LIBS= -ldl
 PLATFORM_FEATURES= -DSUN_DL=1
@@ -60,16 +60,16 @@
 all: $(LIBTARGET) $(STATICLIBTARGET) scheme$(EXE_EXT)
 
 %.$(Osuf): %.c
-	$(CC) -I. -c $(DEBUG) $(FEATURES) $(DL_FLAGS) $<
+	$(CC) -fpic $(CFLAGS) -I. -c $(FEATURES) $(DL_FLAGS) $<
 
 $(LIBTARGET): $(OBJS)
-	$(LD) $(LDFLAGS) $(OUT) $(OBJS) $(SYS_LIBS)
+	$(LD) -shared $(LDFLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(SYS_LIBS)
 
 scheme$(EXE_EXT): $(OBJS)
-	$(CC) -o $@ $(DEBUG) $(OBJS) $(SYS_LIBS)
+	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(SYS_LIBS)
 
 $(STATICLIBTARGET): $(OBJS)
-	$(AR) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 $(OBJS): scheme.h scheme-private.h opdefines.h
 dynload.$(Osuf): dynload.h