diff -Nurd -x'*~' gdis-0.89.orig/connect.c gdis-0.89/connect.c
--- gdis-0.89.orig/connect.c	2006-08-01 07:45:49.000000000 -0400
+++ gdis-0.89/connect.c	2008-02-22 02:19:53.000000000 -0500
@@ -35,6 +35,7 @@
 #include "interface.h"
 #include "shortcuts.h"
 #include "matrix.h"
+#include "model.h"
 #include "spatial.h"
 #include "numeric.h"
 #include "morph.h"
diff -Nurd -x'*~' gdis-0.89.orig/coords.h gdis-0.89/coords.h
--- gdis-0.89.orig/coords.h	2006-07-31 02:42:41.000000000 -0400
+++ gdis-0.89/coords.h	2008-02-22 03:17:30.000000000 -0500
@@ -281,3 +281,4 @@
                              struct model_pak *);
 GSList *connect_neighbours(struct core_pak *) ;
 
+gint connect_split(struct bond_pak *bond);
diff -Nurd -x'*~' gdis-0.89.orig/crystal_graph.c gdis-0.89/crystal_graph.c
--- gdis-0.89.orig/crystal_graph.c	2005-11-24 01:07:31.000000000 -0500
+++ gdis-0.89/crystal_graph.c	2008-02-22 03:25:03.000000000 -0500
@@ -20,6 +20,7 @@
  The GNU GPL can also be found at http://www.gnu.org
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -33,6 +34,7 @@
 #include "matrix.h"
 #include "interface.h"
 #include "numeric.h"
+#include "type.h"
 
 /* main structures */
 extern struct sysenv_pak sysenv;
diff -Nurd -x'*~' gdis-0.89.orig/main.c gdis-0.89/main.c
--- gdis-0.89.orig/main.c	2006-07-26 02:15:28.000000000 -0400
+++ gdis-0.89/main.c	2008-02-22 01:43:40.000000000 -0500
@@ -508,17 +508,8 @@
 printf("cwd: [%s]\n", sysenv.cwd);
 #endif
 
-/* generate element file full pathname */
-/* sometimes this returns the program name, and sometimes it doesn't */
-temp = g_find_program_in_path(argv[0]);
-/* remove program name (if attached) */
-if (g_file_test(temp, G_FILE_TEST_IS_DIR))
-  sysenv.gdis_path = temp;
-else
-  {
-  sysenv.gdis_path = g_path_get_dirname(temp);
-  g_free(temp);
-  }
+/* hard-code where support files are located */
+ sysenv.gdis_path = strdup(DATADIR);
 
 #if DEBUG_SYS_INIT
 printf("%s path: [%s]\n", argv[0], sysenv.gdis_path);
diff -Nurd -x'*~' gdis-0.89.orig/makefile gdis-0.89/makefile
--- gdis-0.89.orig/makefile	2006-10-15 23:40:20.000000000 -0400
+++ gdis-0.89/makefile	2008-02-22 03:19:07.000000000 -0500
@@ -28,6 +28,10 @@
 
 OBJ = $(SRC:.c=.o)
 
+vars:
+	echo INCS = $(INCS)
+	echo LIBS = $(LIBS)
+
 gdis: $(OBJ)
 	$(CC) $(OBJ) $(LDFLAGS) -o gdis $(LIBS)
 
@@ -38,7 +42,7 @@
 .SUFFIXES: .c .o .app .dmg
 
 .c.o: 
-	$(CC) $(CFLAGS) -c $< $(INCS)
+	$(CC) $(CFLAGS) -DDATADIR="\"${prefix}/share/gdis\"" -c $< $(INCS)
 
 .PHONY: clean
 clean:
@@ -48,11 +52,13 @@
 
 .PHONY: install
 install:
-	/usr/bin/strip gdis
-	/bin/cp gdis $(INSTALL)
-	/bin/cp gdis.elements $(INSTALL)
-	/bin/cp gdis.library $(INSTALL)
-	/bin/cp gdis.manual $(INSTALL)
+#	/usr/bin/strip gdis
+	mkdir -p $(prefix)/bin
+	/bin/cp gdis $(prefix)/bin
+	mkdir -p $(prefix)/share/gdis
+	/bin/cp gdis.elements $(prefix)/share/gdis
+	/bin/cp gdis.library $(prefix)/share/gdis
+	/bin/cp gdis.manual $(prefix)/share/gdis
 
 .PHONY: tgz
 tgz:
diff -Nurd -x'*~' gdis-0.89.orig/type.h gdis-0.89/type.h
--- gdis-0.89.orig/type.h	2006-07-31 02:42:41.000000000 -0400
+++ gdis-0.89/type.h	2008-02-22 03:24:40.000000000 -0500
@@ -30,3 +30,4 @@
 
 gint type_apply(gpointer, GSList *);
 
+void type_dreiding_gasteiger(struct model_pak *model, gint mode);