mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-11 06:10:06 +02:00
57 lines
1.8 KiB
Plaintext
57 lines
1.8 KiB
Plaintext
From f36234c7f43ff11e9346fd9975c28d0c18cda6ad Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 15 Jul 2017 13:53:14 +0200
|
|
Subject: apply patch from 1.5.4.
|
|
|
|
|
|
diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
|
|
index 127d75f..d79ea5d 100644
|
|
--- a/build/apu-conf.m4
|
|
+++ b/build/apu-conf.m4
|
|
@@ -141,10 +141,10 @@ AC_ARG_WITH([expat],
|
|
else
|
|
# Add given path to standard search paths if appropriate:
|
|
if test "$withval" != "/usr"; then
|
|
- APR_ADDTO(LDFLAGS, [-L$withval/lib])
|
|
- APR_ADDTO(CPPFLAGS, [-I$withval/include])
|
|
- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
|
|
- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
|
|
+ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib])
|
|
+ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers])
|
|
+ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers])
|
|
+ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib])
|
|
fi
|
|
fi
|
|
])
|
|
diff --git a/config.layout b/config.layout
|
|
index 907d0bb..b552f5d 100644
|
|
--- a/config.layout
|
|
+++ b/config.layout
|
|
@@ -60,6 +60,23 @@
|
|
runtimedir: ${localstatedir}/run
|
|
</Layout>
|
|
|
|
+# Haiku Layout making use of finddir
|
|
+<Layout haiku>
|
|
+ prefix: /boot/system
|
|
+ exec_prefix: /boot/system
|
|
+ bindir: /boot/system/bin
|
|
+ sbindir: /boot/system/servers
|
|
+ libdir: /boot/system/lib
|
|
+ libexecdir: /boot/system/servers
|
|
+ mandir: /boot/system/documentation/man
|
|
+ sysconfdir: /boot/system/settings
|
|
+ datadir: /boot/system/data
|
|
+ installbuilddir: /boot/system/develop/build
|
|
+ includedir: /boot/system/include
|
|
+ localstatedir: /boot/system/var
|
|
+ runtimedir: ${localstatedir}/log
|
|
+</Layout>
|
|
+
|
|
# Mac OS X Server (Rhapsody)
|
|
<Layout Mac OS X Server>
|
|
prefix: /Local/Library/WebServer
|
|
--
|
|
2.12.2
|
|
|