--- ./CS/mk/nasm.mak.orig	Sun Aug 11 17:30:49 2002
+++ ./CS/mk/nasm.mak	Sun Aug 11 17:31:15 2002
@@ -12,6 +12,12 @@
 override NASM.INSTALLED = no
 endif
 
+# CS doesn't work with Gentoo NAsm at the moment, It's easier to
+# disable than fix (optimizations should still be there through gcc)
+ifeq ($(NASM.INSTALLED),yes)
+override NASM.INSTALLED = no
+endif
+
 ifeq ($(NASM.INSTALLED),yes)
 
 # The executable name
--- ./CS/libs/cssys/unix/linux.mak.orig	Sun Aug 11 18:02:19 2002
+++ ./CS/libs/cssys/unix/linux.mak	Sun Aug 11 18:09:57 2002
@@ -89,9 +89,9 @@
 
 # Flags for the compiler which are used when optimizing.
 ifeq ($(PROC),X86)
-  CFLAGS.optimize=-O2 -fomit-frame-pointer -ffast-math
+  CFLAGS.optimize=$(CFLAGS_GENTOO)
 else
-  CFLAGS.optimize=-O -fomit-frame-pointer
+  CFLAGS.optimize=$(CFLAGS_GENTOO)
 endif
 
 # Flags for the compiler which are used when debugging.
--- ./CS/mk/unix.mak.orig	Sun Aug 11 19:14:57 2002
+++ ./CS/mk/unix.mak	Sun Aug 11 19:15:37 2002
@@ -34,7 +34,7 @@
 # Command sequence for creating a directory.
 # Note that directories will have forward slashes. Please
 # make sure that this command accepts that (or use 'subst' first).
-MKDIR=mkdir $(@:/=)
+MKDIR=mkdir -p $(@:/=)
 
 # The command to remove all specified files.
 RM=rm -f
--- ./CS/mk/install.mak.orig	Tue Nov  6 13:32:16 2001
+++ ./CS/mk/install.mak	Sun Aug 11 21:58:29 2002
@@ -24,7 +24,11 @@
 ifneq ($(findstring defines,$(MAKESECTION)),)
 
 ifeq (,$(strip $(INSTALL_DIR)))
-INSTALL_DIR = /usr/local/crystal
+INSTALL_DIR = $(DESTDIR)/usr/crystalspace
+endif
+
+ifeq (,$(strip $(DOCS_INSTALL_DIR)))
+DOCS_INSTALL_DIR = $(DESTDIR)/usr/share/doc/$(P)
 endif
 
 endif # ifneq ($(findstring defines,$(MAKESECTION)),)
@@ -87,14 +91,14 @@
   docs/html/*/*.jpg docs/html/*/*.gif docs/html/*/*.png  \
   docs/html/*/*/*.jpg docs/html/*/*/*.gif docs/html/*/*/*.png \
   docs/pubapi/*.html docs/pubapi/*.gif docs/pubapi/*.css )
-INSTALL_DOCS.DIR1 = $(addprefix $(INSTALL_DIR)/, \
+INSTALL_DOCS.DIR1 = $(addprefix $(DOCS_INSTALL_DIR)/, \
   $(patsubst %/,%,$(sort $(dir $(INSTALL_DOCS.FILES)))))
 
 # Also include parent dirs in dirlist, for tutorial/mapcs 
-INSTALL_DOCS.DIR = $(filter-out $(INSTALL_DIR), \
-  $(sort $(INSTALL_DOCS.DIR1) $(patsubst %/,%,$(dir $(INSTALL_DOCS.DIR1)))))
+INSTALL_DOCS.DIR = $(subst /docs/,/,$(filter-out $(DOCS_INSTALL_DIR) $(DOCS_INSTALL_DIR)/docs, \
+  $(sort $(INSTALL_DOCS.DIR1) $(patsubst %/,%,$(dir $(INSTALL_DOCS.DIR1))))))
 INSTALL_DOCS.DESTFILES = \
-  $(addprefix $(INSTALL_DIR)/,$(sort $(INSTALL_DOCS.FILES)))
+  $(subst /docs/,/,$(addprefix $(DOCS_INSTALL_DIR)/,$(sort $(INSTALL_DOCS.FILES))))
 
 # Files to install for scripts, includes parent dirs (for scripts/).
 INSTALL_SCRIPTS.FILES = $(wildcard scripts/python/*.py)
@@ -131,7 +135,7 @@
 
 # Rules for creating installation directories.
 $(INSTALL_DIR) $(INSTALL_DIR)/bin $(INSTALL_LIB.DIR) $(INSTALL_INCLUDE.DIR) \
-$(INSTALL_DIR)/data $(INSTALL_DIR)/data/config:
+$(INSTALL_DIR)/data $(INSTALL_DIR)/data/config $(DOCS_INSTALL_DIR):
 	$(MKDIR)
 
 ifneq ($(strip $(OUTDLL)),)
@@ -194,11 +198,11 @@
 	$(MKDIR)
 	@echo $@/deleteme.dir >> $(INSTALL_LOG)
 
-$(INSTALL_DOCS.DESTFILES): $(INSTALL_DIR)/docs/% : docs/%
+$(INSTALL_DOCS.DESTFILES): $(DOCS_INSTALL_DIR)/% : docs/%
 	$(CP) $< $@
 	@echo $@ >> $(INSTALL_LOG)
 
-install_docs: $(INSTALL_DIR)/docs $(INSTALL_DOCS.DIR) \
+install_docs: $(DOCS_INSTALL_DIR) $(INSTALL_DOCS.DIR) \
   $(INSTALL_DOCS.DESTFILES)
 
 # Install Scripts
--- ./CS/mk/user.mak.orig	Sat Aug 17 15:05:01 2002
+++ ./CS/mk/user.mak	Sat Aug 17 15:05:41 2002
@@ -85,12 +85,12 @@
 PLUGINS.DYNAMIC += mesh/impexp/obj
 PLUGINS.DYNAMIC += mesh/impexp/pov
 PLUGINS.DYNAMIC += mesh/impexp/spr
-#PLUGINS.DYNAMIC += mesh/impexp/3ds
+PLUGINS.DYNAMIC += mesh/impexp/3ds
 PLUGINS.DYNAMIC += font/server/fontplex
 #PLUGINS.DYNAMIC += font/server/freefont
 #PLUGINS.DYNAMIC += font/server/freefnt2
 PLUGINS.DYNAMIC += aws
-#PLUGINS.DYNAMIC += sound/loader/ogg
+PLUGINS.DYNAMIC += sound/loader/ogg
 #PLUGINS.DYNAMIC += sound/loader/mp3
 #PLUGINS.DYNAMIC += sound/loader/mod
 
@@ -157,7 +157,7 @@
 
 # If 'yes' include assembly optimizations in Crystal Space.  On systems that
 # don't support this, setting this option to 'yes' does nothing.
-DO_ASM=yes
+DO_ASM=no
 
 # If "yes" include MMX support in software renderer
 DO_MMX=yes