--- searchandrescue_1.3.0.orig/sar/makefile_append.ini
+++ searchandrescue_1.3.0/sar/makefile_append.ini
@@ -3,7 +3,7 @@
 
 
 # C++ flags:
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+CPPFLAGS += -D__cplusplus -Dc_plusplus
 
 
 # Source files list:
@@ -16,14 +16,12 @@
 OBJ_CPP = $(SRC_CPP:.cpp=.o)
 .c.o:
 	@echo "Compiling module $*.o"
-	@$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
 .cpp.o:
 	@echo "Compiling module $*.o"
-	@$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+	$(CPP) -c $*.cpp $(INC_DIRS) $(CPPFLAGS)
 
 # Programs
-LS      = ls
-LSFLAGS = -s -h -c --color=auto
 RM      = rm
 RMFLAGS = -f
 
@@ -32,9 +30,8 @@
 
 modules: $(OBJ_C) $(OBJ_CPP)
 	@echo -n "Linking modules..."
-	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
+	$(CPP) $(OBJ_C) $(OBJ_CPP) $(LDFLAGS) -o $(BIN) $(LIBS) $(LIB_DIRS)
 	@echo -n "   "
-	@-$(LS) $(LSFLAGS) $(BIN)
 
 prebuild:
 	@echo "Building program \"$(BIN)\"..."
@@ -54,5 +51,5 @@
 clean:
 	@echo "Cleaning program \"$(BIN)\"..."
 	@echo "Deleting all intermediate files..."
-	@$(RM) $(RMFLAGS) a.out core *.o $(BIN)
+	$(RM) $(RMFLAGS) a.out core *.o $(BIN)
 	@echo "Clean done."
--- searchandrescue_1.3.0.orig/sar/platforms.ini
+++ searchandrescue_1.3.0/sar/platforms.ini
@@ -102,7 +102,7 @@
                 FeatureDepend = xf86vidmode-lib
                         DependType = Library
                         MustExist = Yes
-                        DependPath = libXxf86vm.a
+                        DependPath = libXxf86vm.so
                         DependGrepString = XF86VidModeQueryExtension
                 FeatureDepend = xf86vidmode-devel
                         DependType = Header
@@ -223,7 +223,7 @@
                 FeatureDepend = xf86vidmode-lib
                         DependType = Library
                         MustExist = Yes
-                        DependPath = libXxf86vm.a
+                        DependPath = libXxf86vm.so
                         DependGrepString = XF86VidModeQueryExtension
                 FeatureDepend = xf86vidmode-devel
                         DependType = Header