diff -Naur sleuthkit-2.09/check-install sleuthkit-2.09.oden/check-install --- sleuthkit-2.09/check-install 2006-06-15 19:27:57.000000000 +0200 +++ sleuthkit-2.09.oden/check-install 2007-09-07 21:29:36.000000000 +0200 @@ -51,12 +51,6 @@ echo "ERROR: Missing disk_stat tool"; fi -if (test -x "bin/file") then - blah=1; -else - echo "ERROR: Missing 'file' command"; -fi - if (test -x "bin/mactime") then blah=1; else diff -Naur sleuthkit-2.09/Makefile sleuthkit-2.09.oden/Makefile --- sleuthkit-2.09/Makefile 2007-06-05 22:04:39.000000000 +0200 +++ sleuthkit-2.09.oden/Makefile 2007-09-07 21:27:59.000000000 +0200 @@ -10,14 +10,12 @@ $(DIRS): mkdir -p $@ -compile: no-perl mactime sorter file test +compile: no-perl mactime sorter test -compile-static: no-perl-static mactime sorter file test +compile-static: no-perl-static mactime sorter test no-perl: $(MAKE) -C src/auxtools - cd src; sh ./afflib-install.sh - cd src; sh ./libewf-install.sh $(MAKE) -C src/imgtools $(MAKE) -C src/hashtools $(MAKE) -C src/fstools @@ -27,8 +25,6 @@ no-perl-static: $(MAKE) -C src/auxtools OPT=-static - cd src; sh ./afflib-install.sh - cd src; sh ./libewf-install.sh $(MAKE) -C src/imgtools $(MAKE) -C src/hashtools OPT=-static $(MAKE) -C src/fstools OPT=-static @@ -42,9 +38,6 @@ mactime: $(MAKE) -C src/timeline -file: - cd src; sh ./file-install.sh - indent: $(MAKE) -C src/auxtools indent $(MAKE) -C src/imgtools indent @@ -67,15 +60,12 @@ $(MAKE) -C src/disktools $@ $(MAKE) -C src/timeline $@ cd src/sorter; sh ./clean - cd src; sh ./afflib-clean.sh - cd src; sh ./libewf-clean.sh - cd src; sh ./file-clean.sh rm -f lib/libtsk.a rm -f bin/*core rm -f bin/.gdb_history find . -name ".DS_Store" | xargs rm -f find . -name ".*" | grep -v "cvsignore" | grep -v "indent.pro" | grep -v "tidyrc" - find . -type f -perm +g+x,o+x,u+x | grep -v "configure" | xargs chmod -x + find . -type f -perm +g+x,o+x,u+x | xargs chmod -x cat patchlevel release: diff -Naur sleuthkit-2.09/src/fstools/Makefile sleuthkit-2.09.oden/src/fstools/Makefile --- sleuthkit-2.09/src/fstools/Makefile 2007-02-22 06:47:12.000000000 +0100 +++ sleuthkit-2.09.oden/src/fstools/Makefile 2007-09-07 21:32:53.000000000 +0200 @@ -16,7 +16,7 @@ fls_lib.o icat_lib.o ifind_lib.o ils_lib.o \ iso9660.o iso9660_dent.o \ hfs.o hfs_dent.o hfs_journal.o -LIBS = -L../../lib -ltsk -lz -lcrypto +LIBS = -L../../lib -ltsk -lz -lcrypto -lafflib -lewf LIB = ../../lib/libtsk.a BIN_DIR = ../../bin diff -Naur sleuthkit-2.09/src/imgtools/Makefile sleuthkit-2.09.oden/src/imgtools/Makefile --- sleuthkit-2.09/src/imgtools/Makefile 2007-05-17 22:05:08.000000000 +0200 +++ sleuthkit-2.09.oden/src/imgtools/Makefile 2007-09-07 21:07:05.000000000 +0200 @@ -5,10 +5,10 @@ # OPT = -O -Wall -static OPT = -O -Wall DEBUG = -g -INCL = -I../auxtools -I../afflib/lib -I../libewf/include/ +INCL = -I../auxtools -I/usr/include/afflib -I/usr/include/libewf CFLAGS = $(DEFS) $(INCL) $(OPT) $(DEBUG) LIBOBJ = img_open.o img_types.o raw.o split.o aff.o ewf.o -LIBS = -L../../lib -ltsk -lz -lcrypto +LIBS = -L../../lib -ltsk -lz -lcrypto -lafflib -lewf LIB = ../../lib/libtsk.a BIN_DIR = ../../bin PROGS = $(BIN_DIR)/img_stat $(BIN_DIR)/img_cat diff -Naur sleuthkit-2.09/src/mmtools/Makefile sleuthkit-2.09.oden/src/mmtools/Makefile --- sleuthkit-2.09/src/mmtools/Makefile 2007-04-04 20:48:46.000000000 +0200 +++ sleuthkit-2.09.oden/src/mmtools/Makefile 2007-09-07 21:28:11.000000000 +0200 @@ -8,7 +8,7 @@ INCL = -I../auxtools -I../imgtools CFLAGS = $(DEFS) $(INCL) $(OPT) $(DEBUG) LIBOBJ = mm_part.o mm_open.o mm_io.o mm_types.o dos.o mac.o bsd.o sun.o gpt.o -LIBS = -L../../lib -ltsk -lz -lcrypto +LIBS = -L../../lib -ltsk -lz -lcrypto -lafflib -lewf LIB = ../../lib/libtsk.a BIN_DIR = ../../bin PROGS = $(BIN_DIR)/mmls $(BIN_DIR)/mmstat