--- forcefeedback.c.orig	2006-06-05 12:11:08 +0400
+++ libjsw/forcefeedback.c	2006-06-05 12:11:57 +0400
@@ -57,5 +57,5 @@
 
 	/* Deallocate structure itself. */
 	free(ff);
-	ff = ptr = NULL;
+	ptr = ff = NULL;
 }


--- Makefile.Linux.orig	2006-06-05 12:14:36 +0400
+++ libjsw/Makefile.Linux	2006-06-05 12:15:14 +0400
@@ -96,7 +96,7 @@
 
 modules: $(OBJ_C) $(OBJ_CPP)
 	@echo  -n "Linking modules..."
-	@$(CC) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
+	@$(CPP) $(OBJ_C) $(OBJ_CPP) -Wl,-soname=$(LIB) -shared -o $(LIB) $(LIBS) $(LIB_DIRS)
 	@echo -n "   "
 	@$(RM) $(RMFLAGS) $(LIBPFX).so
 	@$(LINK) -s $(LIB) $(LIBPFX).so

--- Makefile.Linux.orig	2006-06-05 12:24:57 +0400
+++ jscalibrator/Makefile.Linux	2006-06-05 12:25:19 +0400
@@ -76,7 +76,7 @@
 #   to the LIB line depending on what you have set in the CFLAGS line
 #   farther above.
 #
-LIBS = -ljsw `gtk-config --libs`
+LIBS = ../libjsw/libjsw.so `gtk-config --libs`
 
 # Library Directories:
 #