X-Git-Url: https://git.distorted.org.uk/~mdw/rocl/blobdiff_plain/10bdc1e42cb7b511157f765fbd2d8c129b7d0176..refs/heads/mdw/wip.crybaby.2016-05-05:/Makefile

diff --git a/Makefile b/Makefile
index 4af2d98..54ae449 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 # Makefile for RIGHT ON COMMAND-LINE
 #
-# $Id: Makefile,v 1.7 2003/03/07 00:47:26 mdw Exp $
+# $Id$
 
 #----- Configuration stuff --------------------------------------------------
 
 # --- Compiling and linking ---
 
 CC = gcc
-INCLUDES = 
+INCLUDES =
 CFLAGS = \
 	-O2 -g -pedantic -Wall -funroll-loops -fomit-frame-pointer \
 	$(INCLUDES)
@@ -27,14 +27,15 @@ 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.0
+VERSION = 1.1.5
 
 TCLSCRIPTS = \
 	elite-editor elite-pairs elite-path elite-find elite-map \
-	elite-prices elite-describe elite-reach elite-cmdr
+	elite-prices elite-describe elite-reach elite-cmdr elite-salesman \
+	elite-tantalus
 
 SRCFILES = elite.c vec.c vec.h graph.c
 
@@ -46,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)
@@ -65,15 +68,27 @@ clean:
 	$(RM) -f *.o *.so pkgIndex.tcl
 
 DISTDIR = $(PACKAGE)-$(VERSION)
-DISTFILES = README Makefile $(SRCFILES) elite.tcl elite.def $(TCLSCRIPTS)
+DISTFILES = \
+	COPYING README Makefile $(SRCFILES) elite.tcl steele.cmdr \
+	elite.def vec.def graph.def $(TCLSCRIPTS) \
+	debian/rules debian/control debian/copyright debian/changelog
 distdir: $(DISTFILES)
 	$(RM) -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	for i in $(DISTFILES); do ln -s ../$$i $(DISTDIR); done
+	mkdir $(DISTDIR) $(DISTDIR)/debian
+	for i in $(DISTFILES); do \
+	  case $$i in \
+	    */*) \
+	      dir=$${i%/*}; \
+	      up=`echo $$dir | sed 's:[^/]\+:..:g'`; \
+	      mkdir -p $(DISTDIR)/$$dir;; \
+	    *) dir= up=;; \
+	  esac; \
+	  ln -s ../$$up/$$i $(DISTDIR)/$$i; \
+	done
 disttar: distdir
-	tar chofz $(DISTDIR).tar.gz $(DISTDIR)
+	tar chofz $(INST)$(DISTDIR).tar.gz $(DISTDIR)
 distzip: distdir
-	cd $(DISTDIR) && zip -rq ../$(DISTDIR).zip .
+	cd $(DISTDIR) && zip -rq ../$(INST)$(DISTDIR).zip .
 dist: disttar distzip
 	$(RM) -rf $(DISTDIR)
 distcheck: dist