From 97f22b07ea72d357cd2cf2d85c7344cc6c63a78e Mon Sep 17 00:00:00 2001
From: slava <slava@factorcode.org>
Date: Sat, 21 Oct 2006 20:01:02 +0000
Subject: [PATCH] Compile fix for 64-bit distros which put 64-bit libraries in
 lib64

---
 Makefile              | 5 +++--
 TODO.FACTOR.txt       | 2 ++
 vm/Config.linux.amd64 | 2 ++
 vm/Config.unix        | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 vm/Config.linux.amd64

diff --git a/Makefile b/Makefile
index a66c57466e..30e4dde208 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ BUNDLE = Factor.app
 VERSION = 0.86
 DISK_IMAGE_DIR = Factor-$(VERSION)
 DISK_IMAGE = Factor-$(VERSION).dmg
+LIBPATH = -L/usr/X11R6/lib
 
 ifdef DEBUG
 	CFLAGS = -g
@@ -75,7 +76,7 @@ macosx-x86: macosx-freetype
 	$(MAKE) $(BINARY) CONFIG=vm/Config.macosx
 
 linux-x86 linux-amd64:
-	$(MAKE) $(BINARY) CONFIG=vm/Config.linux
+	$(MAKE) $(BINARY) CONFIG=vm/Config.linux.amd64
 	$(STRIP) $(BINARY)
 
 linux-ppc:
@@ -124,7 +125,7 @@ macosx.dmg:
 		-volname "$(DISK_IMAGE_DIR)" "$(DISK_IMAGE)"
 
 f: $(OBJS)
-	$(CC) $(LIBS) $(CFLAGS) -o $@$(PLAF_SUFFIX) $(OBJS)
+	$(CC) $(LIBS) $(LIBPATH) $(CFLAGS) -o $@$(PLAF_SUFFIX) $(OBJS)
 
 clean:
 	rm -f vm/*.o
diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 34abc58182..3e20cd5074 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -14,6 +14,8 @@
 - grid slows down with 2000 lines
 - growable data heap
 - more compact relocation info
+- update module system docs
+- cocoa: close item disabled
 
 + ui:
 
diff --git a/vm/Config.linux.amd64 b/vm/Config.linux.amd64
new file mode 100644
index 0000000000..b52449cbe3
--- /dev/null
+++ b/vm/Config.linux.amd64
@@ -0,0 +1,2 @@
+include vm/Config.linux
+LIBPATH = -L/usr/X11R6/lib64 $(LIBPATH)
diff --git a/vm/Config.unix b/vm/Config.unix
index 0fca1bf1da..d785a6a216 100644
--- a/vm/Config.unix
+++ b/vm/Config.unix
@@ -3,5 +3,5 @@ PLAF_OBJS = vm/os-unix.o
 ifdef NO_UI
 	X11_UI_LIBS =
 else
-	X11_UI_LIBS = -lfreetype -lGL -lGLU -L/usr/X11R6/lib -lX11
+	X11_UI_LIBS = -lfreetype -lGL -lGLU -lX11
 endif