--- configure.old 2007-05-05 17:57:35.000000000 +0200 +++ configure 2007-05-05 20:38:41.000000000 +0200 @@ -58,7 +58,7 @@ echo "BITS = " $BITS >> config.h echo " [*] Enabling readline support" READLN="1" echo "READLNOPT = -DUSE_READLN" >> config.h -echo "LDREADLNOPT = -lreadline -ltermcap" >> config.h +echo "LDREADLNOPT = -lreadline" >> config.h ;; --enable-static*) @@ -148,7 +148,7 @@ fi # Set default variables in case it was not precised if [ "$MODPATHSET" != "1" ]; then - echo "#define ELFSH_MODPATH \"/usr/share/elfsh/\"" >> vars.h + echo "#define ELFSH_MODPATH \"/usr/lib/elfsh/\"" >> vars.h fi if [ "$SHELLSET" != "1" ]; then @@ -160,7 +160,7 @@ if [ "$BUILDOP" != "1" ]; then fi echo " [*] Enabling libasm support" -echo "LDASMOPT = -lasm" >> config.h +echo "LDASMOPT = -lasmelfsh" >> config.h # Now do the OS dependant configuration @@ -225,15 +225,16 @@ echo "" >> Makefile echo "" >> Makefile echo "include ./config.h " >> Makefile echo " " >> Makefile +echo "DESTDIR = /" >> Makefile echo "RM = rm -f " >> Makefile echo "ETAGS = etags " >> Makefile echo "CTAGS = ctags " >> Makefile echo "BASEPATH = \$(DESTDIR)/usr" >> Makefile -echo "MODPATH = \$(BASEPATH)/share/elfsh/" >> Makefile -echo "BINPATH = \$(BASEPATH)/bin/" >> Makefile -echo "LIBPATH = \$(BASEPATH)/lib/" >> Makefile -echo "INCPATH = \$(BASEPATH)/include/" >> Makefile +echo "BINPATH = \$(BASEPATH)/bin" >> Makefile +echo "LIBPATH = \$(BASEPATH)/lib" >> Makefile +echo "INCPATH = \$(BASEPATH)/include" >> Makefile echo "MANPATH = \$(BASEPATH)/share/man" >> Makefile +echo "MODPATH = \$(LIBPATH)/elfsh" >> Makefile echo " " >> Makefile echo "all : world final modules tags" >> Makefile @@ -271,22 +272,29 @@ echo " @echo 'ELFsh modules suite built echo " " >> Makefile echo "install : mod_install " >> Makefile +echo " @mkdir -p \$(BINPATH) \$(LIBPATH) \$(INCPATH)" >> Makefile echo " @cp vm/elfsh \$(BINPATH)/ " >> Makefile +echo " @cp vm/e2dbg.so \$(LIBPATH)/ " >> Makefile echo " @cp libelfsh/libelfsh.a libelfsh/libelfsh.so \$(LIBPATH) " >> Makefile -echo " @cp libasm/libasm.a \$(LIBPATH) " >> Makefile +echo " @cp libasm/libasmelfsh.a \$(LIBPATH) " >> Makefile +echo " @cp libhash/libhashelfsh.a \$(LIBPATH) " >> Makefile echo " @cp -R libelfsh/include/* \$(INCPATH) " >> Makefile +echo " @cp libhash/include/libhash.h \$(INCPATH)" >> Makefile echo " @cp libasm/include/libasm.h \$(INCPATH)" >> Makefile echo " @cp libasm/include/libasm-i386.h \$(INCPATH) " >> Makefile +echo " @mkdir -p \$(MANPATH)/man1 " >> Makefile echo " @cp doc/elfsh.1 \$(MANPATH)/man1/ " >> Makefile echo " @chmod 755 \$(MANPATH)/man1/elfsh.1 " >> Makefile echo " @chmod 755 \$(BINPATH)/elfsh " >> Makefile -echo " @chmod 755 \$(LIBPATH)libelfsh.so " >> Makefile -echo " @chmod 755 \$(LIBPATH)e2dbg.so " >> Makefile -echo " @chmod 755 \$(INCPATH)libelfsh*.h " >> Makefile -echo " @chmod 755 \$(LIBPATH)libelfsh.a " >> Makefile -echo " @chmod 755 \$(LIBPATH)libasm.a " >> Makefile -echo " @chmod 755 \$(INCPATH)libelfsh*.h " >> Makefile -echo " @chmod 755 \$(INCPATH)libasm*.h " >> Makefile +echo " @chmod 755 \$(LIBPATH)/libelfsh.so " >> Makefile +echo " @chmod 755 \$(LIBPATH)/e2dbg.so " >> Makefile +echo " @chmod 755 \$(INCPATH)/libelfsh*.h " >> Makefile +echo " @chmod 755 \$(LIBPATH)/libelfsh.a " >> Makefile +echo " @chmod 755 \$(LIBPATH)/libasmelfsh.a " >> Makefile +echo " @chmod 755 \$(LIBPATH)/libhashelfsh.a " >> Makefile +echo " @chmod 755 \$(INCPATH)/libelfsh*.h " >> Makefile +echo " @chmod 755 \$(INCPATH)/libasm*.h " >> Makefile +echo " @chmod 755 \$(INCPATH)/libhash*.h " >> Makefile echo " @echo 'ELFsh, Libelfsh, and Libasm installed successfully .'" >> Makefile echo " " >> Makefile @@ -306,8 +314,8 @@ echo " @echo 'ELFsh ET_DYN has been buil echo " " >> Makefile echo "mod_install: " >> Makefile -echo " @mkdir \$(MODPATH) 2>/dev/null || true " >> Makefile -echo " @cp modules/*.so \$(MODPATH) " >> Makefile +echo " @mkdir -p \$(MODPATH) " >> Makefile +echo " @cp modules/*.so \$(MODPATH) 2>/dev/null || true " >> Makefile echo " @chmod -R 755 \$(MODPATH) " >> Makefile echo " " >> Makefile --- libelfsh/include/libelfsh.h.old 2007-05-05 19:55:23.000000000 +0200 +++ libelfsh/include/libelfsh.h 2007-05-05 19:55:31.000000000 +0200 @@ -8,7 +8,7 @@ #ifndef __LIBELFSH_H_ #define __LIBELFSH_H_ -#include "../../libvars.h" +//#include "../../libvars.h" #include #include --- libasm/Makefile.old 2007-05-05 20:12:14.000000000 +0200 +++ libasm/Makefile 2007-05-05 20:13:56.000000000 +0200 @@ -46,7 +46,7 @@ SRCS_libasm = src/arch/ia32/i386-0.c \ OBJS_libasm = ${SRCS_libasm:.c=.o} -NAME_libasm = libasm.a +NAME_libasm = libasmelfsh.a # # debug source files @@ -60,7 +60,7 @@ CFLAGS = -Iinclude RM = rm -f -LDFLAGS = -L. -lasm +LDFLAGS = -L. -lasmelfsh ETAGS = etags @@ -72,14 +72,14 @@ mydisasm: ${OBJS_mydisasm} $(CC) -o mydisasm ${OBJS_mydisasm} ${LDFLAGS} -lelfsh install: - cp libasm.a /usr/lib + cp libasmelfsh.a /usr/lib cp include/libasm.h /usr/include cp include/libasm-i386.h /usr/include lib: $(OBJS_libasm) @echo Building library. - @ar rc libasm.a ${OBJS_libasm} - @ranlib libasm.a + @ar rc libasmelfsh.a ${OBJS_libasm} + @ranlib libasmelfsh.a clean: @echo Cleaning sources tree. @@ -88,7 +88,7 @@ clean: fclean: clean @echo Removing builds. - @$(RM) mydisasm libasm.a + @$(RM) mydisasm libasmelfsh.a tags: @$(ETAGS) -a arch/i386/*.c include/*.h engine/*.c sample/*.c @echo TAGS generated succesfully --- vm/Makefile.old 2007-05-05 20:46:13.000000000 +0200 +++ vm/Makefile 2007-05-05 20:46:22.000000000 +0200 @@ -38,7 +38,7 @@ CFLAGS = -fPIC -g3 -Wall -Iinclude $(D $(BITS) LDFLAGS = -L../libelfsh/ -lelfsh -L../libhash/ -lhashelfsh \ - -L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasm \ + -L../libdump/ -L/usr/pkg/lib/ -L../libasm/ -lasmelfsh \ -g3 $(LDASMOPT) $(LDREADLNOPT) $(DLOPT) $(DYNOPT) \ $(BITS) $(EXTRAOPT) $(LDDUMPOPT)