summaryrefslogtreecommitdiffstats
path: root/www/web500gw/files/patch-aa
blob: f137547816874b76c965c5b183cf389e63ae8858 (plain)
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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
--- Makefile.orig	Wed Aug  4 13:44:08 1999
+++ Makefile	Wed Aug  4 14:40:54 1999
@@ -3,18 +3,19 @@
 #-----------------------------------------------------------------------------
 
 # Where to install web500gw
-INSTDIR = /usr/local/etc
+#INSTDIR = /usr/local/etc
 
 # Where to install the manual web500gw.8
-MANDIR	= /usr/local/man/man8
+#MANDIR	= /usr/local/man/man8
 
 # Where to install web500gw's config/filter/template/help/message files
 # It's recommended to use an own directory for it.
-WEB500GWDIR	= $(INSTDIR)/web500
+#WEB500GWDIR	= $(INSTDIR)/web500
 
 # What language dependent files should be installed? 
 # "" stands for english (default) versions
-SUFFIX = "" de es fr
+SUFFIX = "" de 
+# es fr
 
 
 # DEFINES - Enable/disable some features
@@ -51,7 +52,7 @@
 
 # T.61 <-> ISO-8859-1 translation: This is built in from LDAP 3.2.
 # If you didn't define this translation there comment out the following line:
-STR_TRANSLATION = -DSTR_TRANSLATION
+#STR_TRANSLATION = -DSTR_TRANSLATION
 # If you defined LDAP_DEBUG there and want to enable LDAP debugging
 # uncomment the following line:
 LDAP_DEBUG = -DLDAP_DEBUG
@@ -69,7 +70,7 @@
 
 # platform specific:
 # Linux
-PLATFORMCFLAGS= -Dlinux -DSYSV 
+# PLATFORMCFLAGS= -Dlinux -DSYSV 
 # Solaris 2
 # PLATFORMCFLAGS= -Dsunos5
 # PLATFORMLDFLAGS= -lsocket -lnsl
@@ -82,8 +83,8 @@
 # AIX
 # PLATFORMCFLAGS= -Daix
 # NetBSD:
-#PLATFORMCFLAGS=
-#PLATFORMLDFLAGS= -lcompat
+# PLATFORMCFLAGS=
+# PLATFORMLDFLAGS= -lcompat
 # OSF/1
 #PLATFORMCFLAGS= -Dosf -DSYSV
 #PLATFORMLDFLAGS=
@@ -99,8 +100,8 @@
 # when using gcc:
 CC	= gcc 
 #WARN = -Wall -Wno-implicit
-#CFLAGS	= -O4 $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings
-CFLAGS	= -g $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings
+CFLAGS	= -O4 $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings
+#CFLAGS	= -g $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings
 
 # or cc:
 #CC	= cc
@@ -110,9 +111,9 @@
 
 ################ end of configuration area ###############
 # ALDFLAGS are always passed to ld
-ALDFLAGS        = $(PLATFORMLDFLAGS)
+ALDFLAGS        = ${LDFLAGS} $(PLATFORMLDFLAGS)
 
-INSTALL = util/install.sh
+#INSTALL = util/install.sh
 MKDIR   = mkdir
 # LIBEFENCE = -lefence
 
@@ -138,7 +139,7 @@
 #web500gw.o:  messages.h web500gw.h
 
 web500gw:	Makefile $(OBJS)
-	$(CC) $(ALDFLAGS) -o $@ $(OBJS)  $(LIBS)
+	$(CC) $(ALDFLAGS) -o $@ $(OBJS)  $(LIBS) -lgnuregex
 
 #$(CC) $(ALDFLAGS) -o $@ $(OBJS) -R/usr/local/ic/usr/lib -L/usr/local/ic/usr/lib -lldap -llber -lisode
 
@@ -160,34 +161,34 @@
 	@echo ""
 	@if [ ! -d $(INSTDIR) ]; then $(MKDIR) -p $(INSTDIR); fi
 	@echo "Installing web500gw to $(INSTDIR)"
-	$(INSTALL) $(INSTALLFLAGS) -m 755 web500gw $(INSTDIR)
+	$(INSTALL_PROGRAM) web500gw $(INSTDIR)
 	@echo "... done!"
 
 install-etc:;
 	@echo ""
 	@if [ ! -d $(WEB500GWDIR) ]; then $(MKDIR) -p $(WEB500GWDIR); fi
 	@echo "Installing web500gw config/template/filter files to $(WEB500GWDIR)"
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/web500gw.conf $(WEB500GWDIR)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldapfilter.conf $(WEB500GWDIR)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldapfilter.conf.internal $(WEB500GWDIR)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldaptemplates.conf $(WEB500GWDIR)
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldaptemplates.conf.internal $(WEB500GWDIR)
+	$(INSTALL_DATA) etc/web500gw.conf $(WEB500GWDIR)/sample.web500gw.conf
+	$(INSTALL_DATA) etc/ldapfilter.conf $(WEB500GWDIR)/sample.ldapfilter.conf
+	$(INSTALL_DATA) etc/ldapfilter.conf.internal $(WEB500GWDIR)/sample.ldapfilter.conf.internal
+	$(INSTALL_DATA) etc/ldaptemplates.conf $(WEB500GWDIR)/sample.ldaptemplates.conf
+	$(INSTALL_DATA) etc/ldaptemplates.conf.internal $(WEB500GWDIR)/sample.ldaptemplates.conf.internal
 	@echo ""
 	@echo "Installing web500gw help/message/friendly files to $(WEB500GWDIR)"
 	@for i in $(SUFFIX); do \
 	if [ "x$$i" = "x" ]; then echo " english"; SUFF="";\
 	else echo " $$i"; SUFF=".$$i"; fi; \
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/web500gw.help$$SUFF $(WEB500GWDIR); \
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/web500gw.messages$$SUFF $(WEB500GWDIR); \
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/web500gw.attr$$SUFF $(WEB500GWDIR); \
-	$(INSTALL) $(INSTALLFLAGS) -m 644 etc/ldapfriendly$$SUFF $(WEB500GWDIR); \
+	$(INSTALL_DATA) etc/web500gw.help$$SUFF $(WEB500GWDIR); \
+	$(INSTALL_DATA) etc/web500gw.messages$$SUFF $(WEB500GWDIR); \
+	$(INSTALL_DATA) etc/web500gw.attr$$SUFF $(WEB500GWDIR); \
+	$(INSTALL_DATA) etc/ldapfriendly$$SUFF $(WEB500GWDIR); \
 	done;
 	@echo "... done!"
 
 install-man:;
 	@echo ""
 	@echo "Installing web500gw.8 to $(MANDIR)"
-	$(INSTALL) $(INSTALLFLAGS) -m 644 doc/web500gw.8 $(MANDIR)
+	$(INSTALL_MAN) doc/web500gw.8 $(MANDIR)
 	@echo "... done!"
 
 lint:;
OpenPOWER on IntegriCloud