summaryrefslogtreecommitdiff
path: root/japanese/canna-lib/files/patch-ac
blob: 4f16834fa9b62cd49346ec7df5e3c7a5469166df (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
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
--- Canna.conf.orig	Thu Oct 24 23:37:25 2002
+++ Canna.conf	Thu Nov  7 09:14:12 2002
@@ -132,11 +132,12 @@
 
 /* root�ˤʤ餺�˥��󥹥ȡ��뤹����Ϥ����������Ʋ����� */
 /* #define InstallAsUser */
-cannaPrefix = /usr/local/canna
+PREFIX?= /usr/local
+cannaPrefix = $(PREFIX)
 cannaExecPrefix = $(cannaPrefix)
 cannaBinDir = $(cannaExecPrefix)/bin
-cannaSrvDir = $(cannaExecPrefix)/bin
-cannaLibDir = $(cannaPrefix)/lib
+cannaSrvDir = $(cannaExecPrefix)/sbin
+cannaLibDir = $(cannaPrefix)/lib/canna
 cannaManDir = $(cannaPrefix)/man
 cannaIncDir = $(cannaPrefix)/include/canna
 
@@ -144,8 +145,8 @@
 libCannaDir = $(cannaExecPrefix)/lib
 ErrDir  = $(cannaExecPrefix)/log
 #else
-libCannaDir = /usr/lib
-ErrDir  = /usr/spool/canna
+libCannaDir = $(cannaPrefix)/lib
+ErrDir  = /var/log
 #endif
 
 /* ����3�Ԥ��ѹ����ʤ��Ǥ������� */
@@ -161,10 +162,11 @@
 #else
 cannaOwnerGroup = -o $(cannaOwner) -g $(cannaGroup)
 #endif
+cannaOwnerDefinition = -DcannaOwner="\"$(cannaOwner)\""
 
 pointerIntegerDef =
 
-cannaDsoRev = 1
+cannaDsoRev = 1.0
     /* SunOS 4.x �򤪻Ȥ������� shared object �����Ѥ�����ˤ�
             cannaDsoRev = 1.1
     �Ȼ��ꤷ�Ƥ����������ޤ���FreeBSD �����Ѥ�����ϡ�
@@ -308,7 +310,7 @@
  * �������鲼���ѹ����ʤ��褦�ˤ��Ƥ���������
  */
 
- CANNASERVER_DEFINES = $(wcharDefinition)
+ CANNASERVER_DEFINES = $(wcharDefinition) $(cannaOwnerDefinition)
           RK_DEFINES = $(pointerIntegerDef)
          RKC_DEFINES = $(wcharDefinition)
        UILIB_DEFINES = $(wcharDefinition) $(pointerIntegerDef) \
@@ -461,6 +463,15 @@
 		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi; \	@@\
 	done
 #endif /* MakeDirectories */
+
+#ifdef LinkFileList
+#undef LinkFileList
+#endif
+#define LinkFileList(step,list,dir,sub)					@@\
+step:: list								@@\
+	@MakeFlagsToShellFlags(i,set +e); \				@@\
+	echo "	cd" dir; cd dir && \					@@\
+	for i in list; do (set -x; $(LN) -f sub/$$i .); done
 
 /* libname-def.cpp����Τ����ݤʤΤ�X��SharedLibraryTarget���� */
 #ifdef CYGWIN_DLL