File dev86-0.16.17-x86_64_fixes.diff of Package vt.bin86

--- makefile.in.old	2007-04-09 14:33:17.000000000 +0200
+++ makefile.in	2007-04-09 14:44:14.000000000 +0200
@@ -89,10 +89,10 @@
 
 #ifdef GNUMAKE
 all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
-     library lib-bsd alt-libs elksemu
+     library lib-bsd alt-libs
 
 install: check_config install-bcc install-man \
-     install-lib install-emu
+     install-lib
 
 install-all: install install-other
 
@@ -135,7 +135,7 @@
 # Others to install
 OTHERS=  tests dis88 doselks bootblocks
 
-CLEANLIST= bcc as ar ld cpp unproto copt libc elksemu libbsd $(OTHERS)
+CLEANLIST= bcc as ar ld cpp unproto copt libc libbsd $(OTHERS)
 
 ##############################################################################
 
@@ -200,18 +200,6 @@
 	$(MAKEC) ld $(MAKEARG) objdump86
 	cp -p ld/objdump86$(EXE) bin/objdump86$(EXE)
 
-#ifndef __AS386_16__
-#ifdef __elksemu_works__
-elksemu: bindir
-	$(MAKEC) elksemu elksemu
-	cp -p elksemu/elksemu bin/elksemu
-#else
-elksemu: bindir
-	$(MAKEC) elksemu CC='ncc' elksemu
-	cp -p elksemu/elksemu bin/elksemu
-#endif
-#endif
-
 install-bcc: bcc86 cpp unproto copt as86 ar86 ld86 objdump86
 	install -d $(DISTBIN) $(DISTLIB)
 	install $(INEXE) bin/Bcc$(EXE) 		$(DISTBIN)/bcc$(EXE)
@@ -230,13 +218,6 @@
 	install -d $(DISTLIB)/i386
 	install $(INDAT) lib/i386/rules.* 	$(DISTLIB)/i386
 
-# NB: This doesn't install as a suid root, that's ok though.
-install-emu: elksemu
-#ifdef __elksemu_works__
-	install -d $(DISTBIN)
-	install $(INEXE) bin/elksemu 	$(DISTBIN)/elksemu
-#endif
-
 install-man:
 	-$(MAKEC) man MANDIR=$(DIST)$(MANDIR) install
 
--- bcc/bcc.c.old	2007-04-09 14:33:27.000000000 +0200
+++ bcc/bcc.c	2007-04-09 14:44:44.000000000 +0200
@@ -226,12 +226,12 @@
 
    } else {
       /* Relative paths to normal PREFIX directory */
-      default_include = build_libpath("-I", "/lib/bcc/include", "");
-      default_libdir  = build_libpath("-L", "/lib/bcc", libdir_suffix);
-      optim_rules     = build_libpath("-d", "/lib/bcc", libdir_suffix);
+      default_include = build_libpath("-I", "/lib64/bcc/include", "");
+      default_libdir  = build_libpath("-L", "/lib64/bcc", libdir_suffix);
+      optim_rules     = build_libpath("-d", "/lib64/bcc", libdir_suffix);
 
-      build_prefix("/lib/bcc", libdir_suffix, "");
-      build_prefix("/lib/bcc", "", "");
+      build_prefix("/lib64/bcc", libdir_suffix, "");
+      build_prefix("/lib64/bcc", "", "");
    }
 
    build_prefix("/bin", "", "");