Found in crybaby's working tree.

[rocl] / Makefile

diff --git a/Makefile b/Makefile
index b6f6d71c0007ee3798bbdd41b8f25361bcc2686c..54ae44908bbb4afa797f3fae3c3a0d8f76f55639 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 # --- Compiling and linking ---
 
 CC = gcc
-INCLUDES = 
+INCLUDES =
 CFLAGS = \
        -O2 -g -pedantic -Wall -funroll-loops -fomit-frame-pointer \
        $(INCLUDES)
@@ -27,7 +27,7 @@ RM = rm
 
 #----- Main machinery -------------------------------------------------------
 #
-# Shouldn't need to fiddle with thiis stuff.
+# Shouldn't need to fiddle with this stuff.
 
 PACKAGE = rocl
 VERSION = 1.1.5
@@ -47,15 +47,17 @@ elite.so: elite.o
        $(LD) $(LDFLAGS) elite.o -o elite.so
 vec.so: vec.o
        $(LD) $(LDFLAGS) vec.o -o vec.so
-graph.so: graph.o
-       $(LD) $(LDFLAGS) graph.o -o graph.so
+graph.so: graph.o vec.so
+       $(LD) $(LDFLAGS) -Wl,-rpath,$(pkglibdir) graph.o vec.so -o graph.so
 graph.o vec.o: vec.h
 
 .SUFFIXES: .c .o
 .c.o:; $(CC) -c $(CFLAGS) -o $@ $<
 
 pkgIndex.tcl: $(PKGFILES)
-       echo "pkg_mkIndex -verbose -direct -load Vec . $(PKGFILES) " | tclsh
+       LD_LIBRARY_PATH=$$(pwd) \
+         echo "pkg_mkIndex -verbose -direct -load Vec . $(PKGFILES) " | \
+         tclsh
 
 install: all
        $(INSTALL) -d $(INST)$(bindir) $(INST)$(pkglibdir)