webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 10:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jlentfer/multicat' into next

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Michael Tremer
2013-06-14 13:12:47 +02:00
parent 3de19c87ca 0a21ce42e1
commit 97f0fdd5f3
7 changed files with 340 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/patches/bitstream-makefile.patch Normal file
View File

@@ -0,0 +1,7 @@
--- Makefile.org 2013-06-14 12:59:46.000000000 +0200
+++ Makefile 2013-06-14 13:00:01.000000000 +0200
@@ -1,4 +1,4 @@
-PREFIX ?= /usr/local
+PREFIX ?= /usr
INCLUDE = $(subst //,/,$(DESTDIR)/$(PREFIX)/include/bitstream)
VERSION = 1.0

12
src/patches/multicat-makefile.patch Normal file
View File

@@ -0,0 +1,12 @@
--- Makefile.orig 2013-06-14 12:39:11.000000000 +0200
+++ Makefile 2013-06-14 12:39:20.000000000 +0200
@@ -13,7 +13,7 @@
OBJ_LASTS = lasts.o
OBJ_MULTICAT_VALIDATE = multicat_validate.o util.o
-PREFIX ?= /usr/local
+PREFIX ?= /usr
BIN = $(DESTDIR)/$(PREFIX)/bin
MAN = $(DESTDIR)/$(PREFIX)/share/man/man1