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
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
$NetBSD: patch-ac,v 1.6 2009/12/10 20:34:44 abs Exp $
--- XView.obj.orig 1993-06-29 05:13:20.000000000 +0000
+++ XView.obj
@@ -15,7 +15,7 @@
STD_DEFINES = StandardDefines LibXViewDefines
#endif
HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-INCLUDES= -I$(BUILDINCDIR)$(INCDIR)
+INCLUDES= -I$(BUILDINCDIR)/$(INCDIR)
OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
#if !NotLibXView
ALLFILES = $(SRCS) $(HEADERS)
@@ -85,17 +85,17 @@ NormalLintTarget($(SRCS))
#if SubdirHasPublicHeaders
# if NotLibXView
-BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
+BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
install::
- $(MKDIRHIER) $(PUB_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
# else
-BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
+BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
install::
- $(MKDIRHIER) $(XVPUB_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
# endif
@@ -103,19 +103,19 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
#if SubdirHasPrivateHeaders
# if NotLibXView
-BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
+BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
# else
-BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
+BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
# endif
# if InstallPrivateHeaders
# if NotLibXView
install::
- $(MKDIRHIER) $(PRI_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(PRI_HEADER_DEST)
InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
# else
install::
- $(MKDIRHIER) $(XVPRI_HEADER_DEST)
+ $(MKDIRHIER) $(DESTDIR)$(XVPRI_HEADER_DEST)
InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
# endif
|