--- bzip2-1.0.6/Makefile.orig Fri Sep 10 15:46:02 2010
+++ bzip2-1.0.6/Makefile Tue Apr 14 12:32:30 2015
@@ -33,34 +33,33 @@
randtable.o \
compress.o \
decompress.o \
- bzlib.o
+ bzlib.o \
+ oldapi.o
-all: libbz2.a bzip2 bzip2recover test
+all: libbz2.so bzip2 bzip2recover test
-bzip2: libbz2.a bzip2.o
+bzip2: libbz2.so bzip2.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
-libbz2.a: $(OBJS)
- rm -f libbz2.a
- $(AR) cq libbz2.a $(OBJS)
- @if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
- -f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
- echo $(RANLIB) libbz2.a ; \
- $(RANLIB) libbz2.a ; \
- fi
+libbz2.so: $(OBJS)
+ rm -f libbz2.so libbz2.so.1
+ $(CC) $(CFLAGS) -G -h libbz2.so.1 -o libbz2.so.1 \
+ -z defs -z text -zcombreloc $(OBJS) -M ../../mapfile -L. \
+ -lc
+ ln -s libbz2.so.1 libbz2.so
check: test
test: bzip2
@cat words1
- ./bzip2 -1 < sample1.ref > sample1.rb2
- ./bzip2 -2 < sample2.ref > sample2.rb2
- ./bzip2 -3 < sample3.ref > sample3.rb2
- ./bzip2 -d < sample1.bz2 > sample1.tst
- ./bzip2 -d < sample2.bz2 > sample2.tst
- ./bzip2 -ds < sample3.bz2 > sample3.tst
+ env LD_LIBRARY_PATH=. ./bzip2 -1 < sample1.ref > sample1.rb2
+ env LD_LIBRARY_PATH=. ./bzip2 -2 < sample2.ref > sample2.rb2
+ env LD_LIBRARY_PATH=. ./bzip2 -3 < sample3.ref > sample3.rb2
+ env LD_LIBRARY_PATH=. ./bzip2 -d < sample1.bz2 > sample1.tst
+ env LD_LIBRARY_PATH=. ./bzip2 -d < sample2.bz2 > sample2.tst
+ env LD_LIBRARY_PATH=. ./bzip2 -ds < sample3.bz2 > sample3.tst
cmp sample1.bz2 sample1.rb2
cmp sample2.bz2 sample2.rb2
cmp sample3.bz2 sample3.rb2
@@ -69,11 +68,27 @@
cmp sample3.tst sample3.ref
@cat words3
+system-test:
+ @cat words1
+ /usr/bin/bzip2 -1 < sample1.ref > sample1.rb2
+ /usr/bin/bzip2 -2 < sample2.ref > sample2.rb2
+ /usr/bin/bzip2 -3 < sample3.ref > sample3.rb2
+ /usr/bin/bzip2 -d < sample1.bz2 > sample1.tst
+ /usr/bin/bzip2 -d < sample2.bz2 > sample2.tst
+ /usr/bin/bzip2 -ds < sample3.bz2 > sample3.tst
+ cmp sample1.bz2 sample1.rb2
+ cmp sample2.bz2 sample2.rb2
+ cmp sample3.bz2 sample3.rb2
+ cmp sample1.tst sample1.ref
+ cmp sample2.tst sample2.ref
+ cmp sample3.tst sample3.ref
+ @cat words3
+
install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+ if ( test ! -d $(PREFIX)/share/man ) ; then mkdir -p $(PREFIX)/share/man ; fi
+ if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir -p $(PREFIX)/share/man/man1 ; fi
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2
@@ -83,30 +98,28 @@
chmod a+x $(PREFIX)/bin/bunzip2
chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
- cp -f bzip2.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzip2.1
+ cp -f bzip2.1 $(PREFIX)/share/man/man1
+ chmod a+r $(PREFIX)/share/man/man1/bzip2.1
cp -f bzlib.h $(PREFIX)/include
chmod a+r $(PREFIX)/include/bzlib.h
- cp -f libbz2.a $(PREFIX)/lib
- chmod a+r $(PREFIX)/lib/libbz2.a
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ ln -s -f ./bzgrep $(PREFIX)/bin/bzegrep
+ ln -s -f ./bzgrep $(PREFIX)/bin/bzfgrep
chmod a+x $(PREFIX)/bin/bzgrep
cp -f bzmore $(PREFIX)/bin/bzmore
- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ ln -s -f ./bzmore $(PREFIX)/bin/bzless
chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ ln -s -f ./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
- chmod a+r $(PREFIX)/man/man1/bzmore.1
- chmod a+r $(PREFIX)/man/man1/bzdiff.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/share/man/man1
+ chmod a+r $(PREFIX)/share/man/man1/bzgrep.1
+ chmod a+r $(PREFIX)/share/man/man1/bzmore.1
+ chmod a+r $(PREFIX)/share/man/man1/bzdiff.1
+ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzegrep.1
+ echo ".so man1/bzgrep.1" > $(PREFIX)/share/man/man1/bzfgrep.1
+ echo ".so man1/bzmore.1" > $(PREFIX)/share/man/man1/bzless.1
+ echo ".so man1/bzdiff.1" > $(PREFIX)/share/man/man1/bzcmp.1
clean:
rm -f *.o libbz2.a bzip2 bzip2recover \
@@ -132,6 +145,8 @@
$(CC) $(CFLAGS) -c bzip2.c
bzip2recover.o: bzip2recover.c
$(CC) $(CFLAGS) -c bzip2recover.c
+oldapi.o: oldapi.c
+ $(CC) $(CFLAGS) -c oldapi.c
distclean: clean