diff -ru skipfish-1.54b/config.h skipfish-1.54b.new/config.h --- skipfish-1.54b/config.h 2010-07-05 23:09:38.000000000 +0200 +++ skipfish-1.54b.new/config.h 2010-08-08 01:52:03.000000000 +0200 @@ -27,8 +27,11 @@ /* Default paths to runtime files: */ -#define ASSETS_DIR "assets" -#define DEF_WORDLIST "skipfish.wl" +/* #define ASSETS_DIR "assets" */ +/* #define DEF_WORDLIST "skipfish.wl" */ +#define ASSETS_DIR "/usr/share/skipfish/assets" +#define DEF_WORDLIST "/usr/share/skipfish/dictionaries/default.wl" + /* Various default settings for HTTP client (cmdline override): */ diff -ru skipfish-1.54b/Makefile skipfish-1.54b.new/Makefile --- skipfish-1.54b/Makefile 2010-08-06 22:45:24.000000000 +0200 +++ skipfish-1.54b.new/Makefile 2010-08-08 01:52:04.000000000 +0200 @@ -26,11 +26,16 @@ INCFILES = alloc-inl.h string-inl.h debug.h types.h http_client.h \ database.h crawler.h analysis.h config.h report.h -CFLAGS_GEN = -Wall -funsigned-char -g -ggdb -I/usr/local/include/ \ - -I/opt/local/include/ $(CFLAGS) -D_FORTIFY_SOURCE=0 \ +CFLAGS = -Wall -g -ggdb -D_FORTIFY_SOURCE=0 -O3 +CFLAGS_GEN = -funsigned-char -I/usr/local/include/ \ + -I/opt/local/include/ $(CFLAGS) \ -DVERSION=\"$(VERSION)\" CFLAGS_DBG = -DLOG_STDERR=1 -DDEBUG_ALLOCATOR=1 $(CFLAGS_GEN) -CFLAGS_OPT = -O3 -Wno-format $(CFLAGS_GEN) +CFLAGS_OPT = -Wno-format $(CFLAGS_GEN) + +PREFIX = /usr +DATADIR = /share/skipfish +BINDIR = /bin LDFLAGS += -L/usr/local/lib/ -L/opt/local/lib LIBS += -lcrypto -lssl -lidn -lz @@ -64,3 +65,12 @@ cd ..; rm -rf skipfish-$(VERSION); cp -pr skipfish skipfish-$(VERSION); \ tar cfvz ~/www/skipfish.tgz skipfish-$(VERSION) chmod 644 ~/www/skipfish.tgz + + +install: $(PROGNAME) + install -m 755 -d $(DESTDIR)$(PREFIX)$(DATADIR) + install -m 755 -d $(DESTDIR)$(PREFIX)$(BINDIR) + install -m 755 skipfish $(DESTDIR)$(PREFIX)$(BINDIR) + cp -r assets $(DESTDIR)$(PREFIX)$(DATADIR) + cp -r dictionaries $(DESTDIR)$(PREFIX)$(DATADIR) + Only in skipfish-1.54b.new: skipfish