aboutsummaryrefslogtreecommitdiffstats
path: root/x11/XFree86-4-libraries/files/patch-z37
blob: 1ac6e657ff690ae71690ab7a5479c1bacd696163 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	Fri Dec 15 04:47:46 2000
+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Fri Jan  5 16:39:23 2001
@@ -12,6 +12,11 @@
 TEXTOBJ	= text-mode.o
 #endif
 
+#if defined(FreeBSDBuildXbin) 
+INCLUDES = -I../parser
+#endif
+
+
 SRCS	=\
 	accessx.c\
 	card-cfg.c\
@@ -82,7 +87,7 @@
 #if DoLoadableServer
 LOADERLIB      = -L../loader -lxloader -L../dummylib -ldummy
 MODULEDEFINES  = -DUSE_MODULES
-INCLUDES       = -I../common -I../loader -I$(XF86OSSRC) \
+INCLUDES       = -I../common -I../loader -I$(XF86OSSRC) -I$(XF86OSSRC)/bus \
 		 -I$(SERVERSRC)/include -I$(XINCLUDESRC)
 #if !HasSnprintf
 SNPRINTF_DEFS  = -DNEED_SNPRINTF
@@ -109,8 +114,10 @@
 
 NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),)
 InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter)
+#if !defined(LibHeaders) || LibHeaders
 InstallMultipleFlags($(XBMPICS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
 InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS))
+#endif
 InstallAppDefaults(XF86Cfg)
 
 CppManTarget(xf86cfg,)