2 files changed, 44 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index eea329a..c4cbc04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,16 @@
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
 
 SHELL=/bin/sh
 
@@ -8,10 +21,10 @@ RANLIB=ranlib
 LDFLAGS=
 
 BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
 
 # Where you want it installed when you do 'make install'
-PREFIX=/usr
+PREFIX=/usr/local
 
 
 OBJS= blocksort.o  \
@@ -77,14 +90,14 @@ install: bzip2 bzip2recover
         cp -f libbz2.a $(PREFIX)/lib
         chmod a+r $(PREFIX)/lib/libbz2.a
         cp -f bzgrep $(PREFIX)/bin/bzgrep
-        ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
-        ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+        ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+        ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
         chmod a+x $(PREFIX)/bin/bzgrep
         cp -f bzmore $(PREFIX)/bin/bzmore
-        ln $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+        ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
         chmod a+x $(PREFIX)/bin/bzmore
         cp -f bzdiff $(PREFIX)/bin/bzdiff
-        ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+        ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
         chmod a+x $(PREFIX)/bin/bzdiff
         cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
         chmod a+r $(PREFIX)/man/man1/bzgrep.1
@@ -124,10 +137,10 @@ bzip2recover.o: bzip2recover.c
 distclean: clean
         rm -f manual.ps manual.html manual.pdf
 
-DISTNAME=bzip2-1.0.3
+DISTNAME=bzip2-1.0.4
 dist: check manual
         rm -f $(DISTNAME)
-        ln -sf . $(DISTNAME)
+        ln -s -f . $(DISTNAME)
         tar cvf $(DISTNAME).tar \
            $(DISTNAME)/blocksort.c \
            $(DISTNAME)/huffman.c \
@@ -167,7 +180,6 @@ dist: check manual
            $(DISTNAME)/libbz2.dsp \
            $(DISTNAME)/dlltest.dsp \
            $(DISTNAME)/makefile.msc \
-           $(DISTNAME)/Y2K_INFO \
            $(DISTNAME)/unzcrash.c \
            $(DISTNAME)/spewG.c \
            $(DISTNAME)/mk251.c \
diff --git a/Makefile-libbz2_so b/Makefile-libbz2_so
index 458c5a1..2b65f3b 100644
--- a/Makefile-libbz2_so
+++ b/Makefile-libbz2_so
@@ -1,15 +1,30 @@
 
 # This Makefile builds a shared version of the library, 
-# libbz2.so.1.0.3, with soname libbz2.so.1.0,
+# libbz2.so.1.0.4, with soname libbz2.so.1.0,
 # at least on x86-Linux (RedHat 7.2), 
 # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).  
-# Please see the README file for some 
-# important info about building the library like this.
+# Please see the README file for some important info 
+# about building the library like this.
+
+# ------------------------------------------------------------------
+# This file is part of bzip2/libbzip2, a program and library for
+# lossless, block-sorting data compression.
+#
+# bzip2/libbzip2 version 1.0.4 of 20 December 2006
+# Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+#
+# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
+# README file.
+#
+# This program is released under the terms of the license contained
+# in the file LICENSE.
+# ------------------------------------------------------------------
+
 
 SHELL=/bin/sh
 CC=gcc
 BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O -g
+CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
 
 OBJS= blocksort.o  \
       huffman.o    \
@@ -20,13 +35,13 @@ OBJS= blocksort.o  \
       bzlib.o
 
 all: $(OBJS)
-        $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.3 $(OBJS)
-        $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+        $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+        $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
         rm -f libbz2.so.1.0
-        ln -s libbz2.so.1.0.3 libbz2.so.1.0
+        ln -s libbz2.so.1.0.4 libbz2.so.1.0
 
 clean: 
-        rm -f $(OBJS) bzip2.o libbz2.so.1.0.3 libbz2.so.1.0 bzip2-shared
+        rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
 
 blocksort.o: blocksort.c
         $(CC) $(CFLAGS) -c blocksort.c