aboutsummaryrefslogtreecommitdiffstats
path: root/x11/XFree86-4-libraries/files/patch-z03
blob: cec66a9790ca0aeaa01bbee66bb0ec5bc64888f1 (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
--- config/cf/Library.tmpl.orig	Wed Oct 13 13:20:41 1999
+++ config/cf/Library.tmpl	Wed Sep  6 14:25:44 2000
@@ -67,7 +67,7 @@
 STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
 CDEBUGFLAGS = LibraryCDebugFlags
 CLIBDEBUGFLAGS = LibraryDebugOpt
-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+     CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS) 
 # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
    PICFLAGS = LargePositionIndependentCFlags
 # endif
@@ -434,10 +434,14 @@
 # ifdef IncSubdir
 #  ifdef IncSubSubdir
 BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..)
+#   if !defined(LibHeaders) || LibHeaders
 InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS))
+#   endif
 #  else
 BuildIncludes($(HEADERS),IncSubdir,..)
+#   if !defined(LibHeaders) || LibHeaders
 InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS))
+#   endif
 #  endif
 # else
 #  ifndef CplusplusSource