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
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
$NetBSD: patch-ae,v 1.4 2000/09/13 20:21:54 jlam Exp $
--- XView.tmpl.orig Sun Jun 26 22:10:00 1994
+++ XView.tmpl
@@ -96,7 +96,7 @@
* Work around small conflict with Project.tmpl file
*/
#if UseInstalled
- MKDIRHIER = BourneShell BinDir/mkdirhier
+ MKDIRHIER = mkdirhier
#endif
#if OsHasLocale
@@ -158,6 +158,12 @@
# endif
CONFIGDIR = XVConfigdir
#endif
+/*
+ * Set the config directory for XView and add this directory to
+ * the places imake searches for config files.
+ */
+ XVCONFIGDIR = $(XVDESTDIR)/lib/X11/xview
+ IMAKE_DEFINES += -I$(XVCONFIGDIR)
XVLIBSRC = $(TOP)/lib
HELP_DEST = XVHelpDest
@@ -192,14 +198,6 @@
AS = as
*/
/*
- * use the same trick X11R5 does for defining rules for installed libs
- */
-#ifdef UseInstalled
-#define _Use(a,b) a
-#else
-#define _Use(a,b) b
-#endif
-/*
* Temporary directory used during build process before the include
* files are installed. This is just a place where symbolic links are
* placed to point back to the actual files in the build hierarchy to
@@ -224,7 +222,7 @@
* afterwards.
*/
#ifndef XVIncludeDirName
-#define XVIncludeDirName /include
+#define XVIncludeDirName include
#endif
INCDIR = XVIncludeDirName
/*
@@ -356,10 +354,10 @@
#if SystemV4
SYSV_CLIENT_LIB = -lintl -ldl
- XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+ XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
#else
SYSV_CLIENT_LIB =
- XVCLIENTSYSDEFINES = -DSUNOS41
+ XVCLIENTSYSDEFINES = -DSUNOS41
#endif
/*
@@ -371,16 +369,16 @@
*/
#if XvI18nLevel == 4
- XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
- XVCLIENTMISCLIB = -lw
- XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
+ XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
+ XVCLIENTMISCLIB = -lw
+ XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
#else
- XVCLIENTI18NDEFINES = -DOW_I18N_L3
- XVCLIENTMISCLIB =
- XVCLIENTINCLUDES =
+ XVCLIENTI18NDEFINES = -DOW_I18N_L3
+ XVCLIENTMISCLIB =
+ XVCLIENTINCLUDES =
#endif
- XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+ XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
/*
* Define libraries for XView clients
|
