mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
Forgot to include the old cdrtools patch into the one for x86_64, this
merges them.
This commit is contained in:
@@ -1,3 +1,26 @@
|
||||
diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
|
||||
--- cdrtools-3.01/DEFAULTS/Defaults.haiku
|
||||
+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku
|
||||
@@ -29,16 +29,16 @@
|
||||
CWARNOPTS=
|
||||
|
||||
DEFINCDIRS= $(SRCROOT)/include
|
||||
-LDPATH= -L/opt/schily/lib
|
||||
+LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY)
|
||||
#RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR)
|
||||
-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib
|
||||
+RUNPATH= -R$(INS_BASE)/lib
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
# Installation config stuff
|
||||
#
|
||||
###########################################################################
|
||||
-INS_BASE= /boot/opt/schily
|
||||
+INS_BASE= $(shell finddir B_COMMON_DIRECTORY)
|
||||
INS_KBASE= /
|
||||
INS_RBASE= /
|
||||
#
|
||||
diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul
|
||||
--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000
|
||||
|
||||
Reference in New Issue
Block a user