Commit | Line | Data |
---|---|---|
6dca1d21 JB |
1 | diff -purN bzip2-1.0.5.orig/Makefile bzip2-1.0.5/Makefile |
2 | --- bzip2-1.0.5.orig/Makefile 2009-11-20 17:39:43.000000000 +0100 | |
3 | +++ bzip2-1.0.5/Makefile 2009-11-20 17:42:54.000000000 +0100 | |
4 | @@ -21,7 +21,7 @@ RANLIB=ranlib | |
5 | LDFLAGS= | |
6 | ||
7 | BIGFILES=-D_FILE_OFFSET_BITS=64 | |
8 | -CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) | |
9 | +CFLAGS+=-Wall -Winline $(BIGFILES) | |
10 | ||
11 | # Where you want it installed when you do 'make install' | |
12 | PREFIX=/usr/local | |
13 | @@ -35,7 +35,7 @@ OBJS= blocksort.o \ | |
14 | decompress.o \ | |
15 | bzlib.o | |
16 | ||
17 | -all: libbz2.a bzip2 bzip2recover test | |
18 | +all: libbz2.a bzip2 bzip2recover | |
19 | ||
20 | bzip2: libbz2.a bzip2.o | |
21 | $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2 | |
22 | @@ -70,43 +70,36 @@ test: bzip2 | |
23 | @cat words3 | |
24 | ||
25 | install: bzip2 bzip2recover | |
26 | - if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi | |
27 | - if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi | |
28 | - if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi | |
29 | - if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi | |
30 | - if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi | |
31 | - cp -f bzip2 $(PREFIX)/bin/bzip2 | |
32 | - cp -f bzip2 $(PREFIX)/bin/bunzip2 | |
33 | - cp -f bzip2 $(PREFIX)/bin/bzcat | |
34 | - cp -f bzip2recover $(PREFIX)/bin/bzip2recover | |
35 | - chmod a+x $(PREFIX)/bin/bzip2 | |
36 | - chmod a+x $(PREFIX)/bin/bunzip2 | |
37 | - chmod a+x $(PREFIX)/bin/bzcat | |
38 | - chmod a+x $(PREFIX)/bin/bzip2recover | |
39 | - cp -f bzip2.1 $(PREFIX)/man/man1 | |
40 | - chmod a+r $(PREFIX)/man/man1/bzip2.1 | |
41 | - cp -f bzlib.h $(PREFIX)/include | |
42 | - chmod a+r $(PREFIX)/include/bzlib.h | |
43 | - cp -f libbz2.a $(PREFIX)/lib | |
44 | - chmod a+r $(PREFIX)/lib/libbz2.a | |
45 | - cp -f bzgrep $(PREFIX)/bin/bzgrep | |
46 | - ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep | |
47 | - ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep | |
48 | - chmod a+x $(PREFIX)/bin/bzgrep | |
49 | - cp -f bzmore $(PREFIX)/bin/bzmore | |
50 | - ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless | |
51 | - chmod a+x $(PREFIX)/bin/bzmore | |
52 | - cp -f bzdiff $(PREFIX)/bin/bzdiff | |
53 | - ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp | |
54 | - chmod a+x $(PREFIX)/bin/bzdiff | |
55 | - cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 | |
56 | - chmod a+r $(PREFIX)/man/man1/bzgrep.1 | |
57 | - chmod a+r $(PREFIX)/man/man1/bzmore.1 | |
58 | - chmod a+r $(PREFIX)/man/man1/bzdiff.1 | |
59 | - echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 | |
60 | - echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 | |
61 | - echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 | |
62 | - echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 | |
63 | + install -d $(PREFIX)/bin \ | |
64 | + $(PREFIX)/lib \ | |
65 | + $(PREFIX)/man/man1 \ | |
66 | + $(PREFIX)/include | |
67 | + install -m 755 bzip2 \ | |
68 | + bzip2recover \ | |
69 | + bzgrep \ | |
70 | + bzmore \ | |
71 | + bzdiff \ | |
72 | + $(PREFIX)/bin | |
73 | + install -m 644 bzlib.h $(PREFIX)/include | |
74 | + install -m 644 libbz2.a $(PREFIX)/lib | |
75 | + ln -sf bzip2 $(PREFIX)/bin/bunzip2 | |
76 | + ln -sf bzip2 $(PREFIX)/bin/bzcat | |
77 | + ln -sf bzgrep $(PREFIX)/bin/bzegrep | |
78 | + ln -sf bzgrep $(PREFIX)/bin/bzfgrep | |
79 | + ln -sf bzmore $(PREFIX)/bin/bzless | |
80 | + ln -sf bzdiff $(PREFIX)/bin/bzcmp | |
81 | + install -m 644 bzip2.1 \ | |
82 | + bzgrep.1 \ | |
83 | + bzmore.1 \ | |
84 | + bzdiff.1 \ | |
85 | + $(PREFIX)/man/man1 | |
86 | + ln -sf bzgrep.1 $(PREFIX)/man/man1/bzegrep.1 | |
87 | + ln -sf bzgrep.1 $(PREFIX)/man/man1/bzfgrep.1 | |
88 | + ln -sf bzmore.1 $(PREFIX)/man/man1/bzless.1 | |
89 | + ln -sf bzdiff.1 $(PREFIX)/man/man1/bzcmp.1 | |
90 | + ln -sf bzip2.1 $(PREFIX)/man/man1/bunzip2.1 | |
91 | + ln -sf bzip2.1 $(PREFIX)/man/man1/bzcat.1 | |
92 | + ln -sf bzip2.1 $(PREFIX)/man/man1/bzip2recover.1 | |
93 | ||
94 | clean: | |
95 | rm -f *.o libbz2.a bzip2 bzip2recover \ | |
96 | diff -purN bzip2-1.0.5.orig/Makefile-libbz2_so bzip2-1.0.5/Makefile-libbz2_so | |
97 | --- bzip2-1.0.5.orig/Makefile-libbz2_so 2009-11-20 17:39:43.000000000 +0100 | |
98 | +++ bzip2-1.0.5/Makefile-libbz2_so 2009-11-20 17:43:20.000000000 +0100 | |
99 | @@ -24,7 +24,7 @@ | |
100 | SHELL=/bin/sh | |
101 | CC=gcc | |
102 | BIGFILES=-D_FILE_OFFSET_BITS=64 | |
103 | -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) | |
104 | +CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) | |
105 | ||
106 | OBJS= blocksort.o \ | |
107 | huffman.o \ | |
108 | @@ -37,11 +37,15 @@ OBJS= blocksort.o \ | |
109 | all: $(OBJS) | |
110 | $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) | |
111 | $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 | |
112 | - rm -f libbz2.so.1.0 | |
113 | - ln -s libbz2.so.1.0.4 libbz2.so.1.0 | |
114 | + | |
115 | +install: | |
116 | + install -d $(PREFIX)/lib | |
117 | + install -m 755 libbz2.so.1.0.4 $(PREFIX)/lib | |
118 | + ln -sf libbz2.so.1.0.4 $(PREFIX)/lib/libbz2.so.1.0 | |
119 | + ln -sf libbz2.so.1.0 $(PREFIX)/lib/libbz2.so | |
120 | ||
121 | clean: | |
122 | - rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared | |
123 | + rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 bzip2-shared | |
124 | ||
125 | blocksort.o: blocksort.c | |
126 | $(CC) $(CFLAGS) -c blocksort.c |