mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 08:40:06 +02:00
9c5bf79cd8
* The modules were previously installed directly in /system/lib/.
Now the are being installed in /system/lib/apache/.
* On x86 secondary arch the modules are now being installed in
/system/lib/x86/apache/, and we can re-enable that arch.
* The "httpd.conf" file, as well as two subdirectories, "extra"
and "original", were previously installed in /system/settings/.
Now they are being installed in /system/settings/apache/.
* Several directories ("build", "cgi-bin", "error", "htdocs",
"icons" and "manual") which were previously installed in
/system/data/ are now being installed in /system/data/apache/.
Remark: Although "cgi-bin", "htdocs" and "icons" could have been
kept in /system/data/, having "build", "error" and "manual" in
/system/data/ was definitely wrong. Hence the global move.
* Move GLOBAL_WRITABLE_FILES before PROVIDES.
23 lines
700 B
Plaintext
23 lines
700 B
Plaintext
From d6536335557d4d5397edf1575881fd980b91ed5a Mon Sep 17 00:00:00 2001
|
|
From: Nav <nav@unlicrea.com>
|
|
Date: Mon, 15 Dec 2014 16:39:31 +0000
|
|
Subject: Fixed redefinition error
|
|
|
|
|
|
diff --git a/server/Makefile.in b/server/Makefile.in
|
|
index 1fa3344..d13b564 100644
|
|
--- a/server/Makefile.in
|
|
+++ b/server/Makefile.in
|
|
@@ -34,7 +34,7 @@ test_char.h: gen_test_char
|
|
util.lo: test_char.h
|
|
|
|
EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
|
|
-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
|
|
+EXPORT_DIRS_APR = $(APU_INCLUDEDIR)
|
|
|
|
# If export_files is a dependency here, but we remove it during this stage,
|
|
# when exports.c is generated, make will not detect that export_files is no
|
|
--
|
|
2.19.0
|
|
|