--- glkloader-0.3.2/Makefile~	2007-12-08 16:54:02.000000000 +0000
+++ glkloader-0.3.2/Makefile	2007-12-08 16:54:24.000000000 +0000
@@ -13,27 +13,20 @@
 # and glk.h, glkstart.h, and Make.glkloader in the include directory.
 
 GLKNAME = glkloader
-GLKINCLUDEDIR = /usr/local/include/glk/
-GLKLIBDIR = /usr/local/lib/
+GLKINCLUDEDIR = /usr/include/glk
+GLKLIBDIR = /usr/$(MULTILIB_LIBDIR)
 
 # Pick a C compiler.
 #CC = cc
-CC = gcc
-LINK = gcc
 INSTALL = install -g 0 -o 0
 
-OPTIONS = -g -Wall -fPIC -DLINUX
-INCLUDEDIRS = -I$(GLKINCLUDEDIR)
-
-CFLAGS = $(OPTIONS) $(INCLUDEDIRS)
-LDFLAGS = -rdynamic
-LIBDIRS =
+CFLAGS += -Wall -DLINUX -I.
+LDFLAGS += -rdynamic
 LIBS = -ldl
 
 XPCONFIG = -Lxpconfig/.libs -lxpconfig
 
-GLKLIBSTATIC = lib$(GLKNAME).a
-GLKLIBSHARED = lib$(GLKNAME).so
+GLKLIBSHARED = lib$(GLKNAME).la
 GLKMAKEFILE = Make.$(GLKNAME)
 
 OBJS =  \
@@ -43,16 +36,13 @@
 HEADERS = \
 	defines.h linux_defines.h
 
-all: $(GLKLIBSTATIC) $(GLKLIBSHARED) $(GLKMAKEFILE)
+all: $(GLKLIBSHARED) $(GLKMAKEFILE)
 
-$(GLKLIBSTATIC): $(OBJS)
-	cd xpconfig && ./internal-build-script 
-	ar r $(GLKLIBSTATIC) $(OBJS)
-	ranlib $(GLKLIBSTATIC)
+%.o: %.c
+	libtool --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 $(GLKLIBSHARED): $(OBJS)
-	cd xpconfig && ./internal-build-script 
-	$(LINK) $(LDFLAGS) -shared -Wl,-soname,$(GLKLIBSHARED).$(MAJOR) -o $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(OBJS) $(LIBDIRS) $(LIBS) $(XPCONFIG)
+	libtool --mode=link $(CC) $(LDFLAGS) -rpath "$(GLKLIBDIR)" -version-number $(MAJOR):$(MINOR):$(MICRO) -o $@ $(OBJS:.o=.lo) $(LIBDIRS) $(LIBS) $(XPCONFIG)
 
 $(GLKMAKEFILE):
 	echo LINKLIBS = $(LIBDIRS) $(LIBS) > $(GLKMAKEFILE)
@@ -64,25 +54,8 @@
 $(OBJS): $(HEADERS)
 
 install:
-	$(INSTALL) -m 2755 -d $(GLKINCLUDEDIR)
-	$(INSTALL) -m 0644 $(GLKMAKEFILE) $(GLKINCLUDEDIR)
-	$(INSTALL) -m 2755 -d $(GLKLIBDIR)
-	$(INSTALL) -m 0644 $(GLKLIBSTATIC) $(GLKLIBDIR)
-	$(INSTALL) -m 0755 $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)
-	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR)
-	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR)
-	ln -s -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKLIBDIR)/$(GLKLIBSHARED)
-	ldconfig
-
-uninstall:
-	rm -f $(GLKINCLUDEDIR)/$(GLKMAKEFILE)
-	rmdir -p --ignore-fail-on-non-empty $(GLKINCLUDEDIR)
-	rm -f $(GLKLIBDIR)/$(GLKLIBSTATIC)
-	rm -f $(GLKLIBDIR)/$(GLKLIBSHARED)
-	rm -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR)
-	rm -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR)
-	rm -f $(GLKLIBDIR)/$(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO)
-	rmdir -p --ignore-fail-on-non-empty $(GLKLIBDIR)
+	$(INSTALL) -m 2755 -d "$(DESTDIR)$(GLKINCLUDEDIR)"
+	$(INSTALL) -m 0644 $(GLKMAKEFILE) "$(DESTDIR)$(GLKINCLUDEDIR)"
+	$(INSTALL) -m 2755 -d "$(DESTDIR)$(GLKLIBDIR)"
+	libtool --mode=install install $(GLKLIBSHARED) "$(DESTDIR)$(GLKLIBDIR)"
 
-clean:
-	rm -f *~ *.o $(GLKLIBSTATIC) $(GLKLIBSHARED).$(MAJOR).$(MINOR).$(MICRO) $(GLKMAKEFILE) glkfuncs.c