diff -ur saphire-1.3.2.orig/Makefile.in saphire-1.3.2/Makefile.in
--- saphire-1.3.2.orig/Makefile.in	2011-03-13 01:04:02.000000000 +0900
+++ saphire-1.3.2/Makefile.in	2011-03-13 01:04:02.000000000 +0900
@@ -30,7 +30,7 @@
 docdir=@docdir@saphire
 
 ##########################################################
-all: saphire sash saphire.sao lib lib-install
+all: lib saphire sash saphire.sao
 	rm -f install
 
 lib: $(CYGWIN_DLL) $(LIBSAPHIRESO1) 
@@ -124,6 +124,9 @@
 	install -m 644 saphire.h "$(includedir)"
 	install -m 644 USAGE.ja.txt "$(docdir)"
 	install -m 644 USAGE.en.txt "$(docdir)"
+	install -m 644 README.ja.txt "$(docdir)"
+	install -m 644 README.en.txt "$(docdir)"
+	install -m 644 CHANGELOG.txt "$(docdir)"
 	rm -f $(bindir)/saphire
 	if echo $(CFLAGS) | grep -q MDEBUG; then install -m 755 saphire "$(bindir)"; else install -s -m 755 saphire "$(bindir)"; fi;
 	rm -f "$(bindir)/sash"
@@ -132,26 +135,29 @@
 	install -m 644 saphire.sao "$(sysconfdir)"
 
 dest-install:
-	mkdir -p "$(DESTDIR)/bin";
-	mkdir -p "$(DESTDIR)/etc";
-	mkdir -p "$(DESTDIR)/lib"
-	mkdir -p "$(DESTDIR)/include"
-	mkdir -p "$(DESTDIR)/share/doc/saphire"
-	install -m 644 saphire_curses.h "$(DESTDIR)/include"
-	install -m 644 saphire_debug.h "$(DESTDIR)/include"
-	install -m 644 saphire_extra.h "$(DESTDIR)/include"
-	install -m 644 saphire_hash.h "$(DESTDIR)/include"
-	install -m 644 saphire_kanji.h "$(DESTDIR)/include"
-	install -m 644 saphire_list.h "$(DESTDIR)/include"
-	install -m 644 saphire_string.h "$(DESTDIR)/include"
-	install -m 644 saphire_vector.h "$(DESTDIR)/include"
-	install -m 644 saphire.h "$(DESTDIR)/include"
-	install -m 644 USAGE.ja.txt "$(DESTDIR)/share/doc/saphire"
-	install -m 644 USAGE.en.txt "$(DESTDIR)/share/doc/saphire"
-	rm -f "$(DESTDIR)/bin/saphire"
-	if echo $(CFLAGS) | grep -q MDEBUG; then install -m 755 saphire "$(DESTDIR)/bin"; else install -s -m 755 saphire "$(DESTDIR)/bin"; fi;
-	rm -f "$(DESTDIR)/bin/sash"
-	if echo $(CFLAGS) | grep -q MDEBUG; then install -m 755 sash "$(DESTDIR)/bin/"; else install -s -m 755 sash "$(DESTDIR)/bin/"; fi;
-	install -m 644 saphire.sa "$(DESTDIR)/etc"
-	install -m 644 saphire.sao "$(DESTDIR)/etc"
+	mkdir -p "$(DESTDIR)/$(bindir)";
+	mkdir -p "$(DESTDIR)/$(sysconfdir)";
+	mkdir -p "$(DESTDIR)/$(libdir)"
+	mkdir -p "$(DESTDIR)/$(includedir)"
+	mkdir -p "$(DESTDIR)/$(docdir)"
+	install -m 644 saphire_curses.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_debug.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_extra.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_hash.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_kanji.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_list.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_string.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire_vector.h "$(DESTDIR)/$(includedir)"
+	install -m 644 saphire.h "$(DESTDIR)/$(includedir)"
+	install -m 644 USAGE.ja.txt "$(DESTDIR)/$(docdir)"
+	install -m 644 USAGE.en.txt "$(DESTDIR)/$(docdir)"
+	install -m 644 README.ja.txt "$(DESTDIR)/$(docdir)"
+	install -m 644 README.en.txt "$(DESTDIR)/$(docdir)"
+	install -m 644 CHANGELOG.txt "$(DESTDIR)/$(docdir)"
+	rm -f "$(DESTDIR)/$(bindir)/saphire"
+	if echo $(CFLAGS) | grep -q MDEBUG; then install -m 755 saphire "$(DESTDIR)/$(bindir)"; else install -s -m 755 saphire "$(DESTDIR)/$(bindir)"; fi;
+	rm -f "$(DESTDIR)/$(bindir)/sash"
+	if echo $(CFLAGS) | grep -q MDEBUG; then install -m 755 sash "$(DESTDIR)/$(bindir)"; else install -s -m 755 sash "$(DESTDIR)/$(bindir)"; fi;
+	install -m 644 saphire.sa "$(DESTDIR)/$(sysconfdir)"
+	install -m 644 saphire.sao "$(DESTDIR)/$(sysconfdir)"
 
diff -ur saphire-1.3.2.orig/configure saphire-1.3.2/configure
--- saphire-1.3.2.orig/configure	2011-02-24 11:19:38.000000000 +0900
+++ saphire-1.3.2/configure	2011-02-24 11:19:38.000000000 +0900
@@ -3060,7 +3060,7 @@
 then
     CFLAGS="-I. -I$myprefix/include -L$myprefix/lib"
 else
-    CFLAGS="-I. -I$myprefix/include -L$myprefix/lib -fPIC"
+    CFLAGS="-I. -L. -I$myprefix/include -L$myprefix/lib -fPIC"
 fi
 
 if test -d /usr/local/include