Make xfs symlink in include/ dir so we can find xfs/foo.h

diff --git a/include/Makefile b/include/Makefile
index 3a2312f60dfb20749db35d87f10174cb11cd5d9a..ca99eefd7372d6d8e3e3ac95a47926268a6fa058 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -46,8 +46,11 @@ HFILES = arch.h handle.h jdm.h libxfs.h libxlog.h xqm.h \
 
 DK_HFILES = mountinfo.h volume.h fstyp.h dvh.h
 LSRCFILES = platform_defs.h.in builddefs.in buildmacros buildrules $(DK_HFILES)
+LDIRT = xfs
 
 default install :
+       rm -f xfs
+       $(LN_S) . xfs
 
 include $(BUILDRULES)
 

diff --git a/include/buildmacros b/include/buildmacros
index 26f90f452dba178cab6a1c238e155ff5e273a25e..d36044338899b6f509ee29cab9c4f74fb086f6aa 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -56,7 +56,7 @@ SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images
 DIST_DIR = $(TOPDIR)/dist
 
-CCF    = $(CC) $(CFLAGS)
+CCF    = $(CC) $(CFLAGS) $(CPPFLAGS)
 MAKEF  = $(MAKE) $(MAKEOPTS)
 CXXF   = $(CXX) $(CXXFLAGS)
 LDF    = $(LD) $(LDFLAGS)