updated patch file, previous one have the links reversed, this one should do the trick.

This commit is contained in:
Scott McCreary
2009-12-27 00:47:25 +00:00
parent 49904829d2
commit 7ac01371f6

View File

@@ -1,7 +1,16 @@
diff -urN bzip2-1.0.5/Makefile bzip2-1.0.5-destdir/Makefile
diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile
--- bzip2-1.0.5/Makefile 2008-02-14 12:39:18.000000000 +0000
+++ bzip2-1.0.5-destdir/Makefile 2009-10-22 07:21:51.000000000 +0000
@@ -70,43 +70,43 @@
+++ bzip2-1.0.5-haiku/Makefile 2009-12-27 00:29:38.000000000 +0000
@@ -24,7 +24,7 @@
CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
-PREFIX=/usr/local
+PREFIX=/boot/common
OBJS= blocksort.o \
@@ -70,43 +70,46 @@
@cat words3
install: bzip2 bzip2recover
@@ -61,15 +70,18 @@ diff -urN bzip2-1.0.5/Makefile bzip2-1.0.5-destdir/Makefile
+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
+ cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib
+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
+ cp -f libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib
+ ln -s -f $(PREFIX)/lib/libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0
+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.4
+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
+ ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
+ chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1