diff options
author | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-14 06:40:07 +0000 |
---|---|---|
committer | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2000-11-14 06:40:07 +0000 |
commit | a4011d6dfd529fd33e330435aa80f89974163ee3 (patch) | |
tree | d4f70b5ae7a2241e1bfff696ec914f241741062a /file_io/unix/Makefile.in | |
parent | b2e12e019e966972c1edab8eb0f5a8b897392bb9 (diff) | |
download | libapr-a4011d6dfd529fd33e330435aa80f89974163ee3.tar.gz |
Fix OS/2 build after the move of private APR headers to the include/arch/
area. This also messes with some unix stuff where it's shared with OS/2.
The strategy used to get the right platform specific include files is:
- Every Makefile.in contains something like
OSDIR=$(INCDIR)/arch/@OSDIR@
DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
- all APR private includes look like #include "fileio.h", ie no leading
arch directory so no #ifdef'ing needed in shared .c files.
This ensures that the include file for the target platform is always used
if it exists, otherwise the default is used.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60720 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/unix/Makefile.in')
-rw-r--r-- | file_io/unix/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in index f4e91328b..282ff7e4f 100644 --- a/file_io/unix/Makefile.in +++ b/file_io/unix/Makefile.in @@ -10,7 +10,9 @@ CFLAGS=@CFLAGS@ @OPTIM@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch +OSDIR=$(INCDIR)/arch/@OSDIR@ +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) #LIB=libfile.a |