From: Kurt Zeilenga Date: Sun, 9 Aug 1998 02:24:07 +0000 (+0000) Subject: Merge FreeBSD Make-templates into LDAPworld branch X-Git-Tag: LDAP_3_3+prerelease~27^2~16 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f6c2f2e6ab42b86f621904c641a9c1a66f1ee16d;p=openldap Merge FreeBSD Make-templates into LDAPworld branch --- diff --git a/Make-common b/Make-common index 32683c7652..405842cc4f 100644 --- a/Make-common +++ b/Make-common @@ -28,8 +28,9 @@ # man pages are put under MANDIR # programs end-users will run are put in BINDIR # -INSTROOT=/usr/local -ETCDIR= $(INSTROOT)/etc +PREFIX?=/usr/local +INSTROOT=${PREFIX} +ETCDIR= $(INSTROOT)/etc/ldap INCLUDEDIR= $(INSTROOT)/include LIBDIR= $(INSTROOT)/lib MANDIR= $(INSTROOT)/man @@ -45,6 +46,7 @@ RUNTIMEETCDIR= $(ETCDIR) ############################################################################# # Passed to every compile (cc or gcc). This is where you put -O or -g, etc. #EXTRACFLAGS=-g +EXTRACFLAGS=-O # Passed to every link (ld). Include -g here if you did in EXTRACFLAGS. #EXTRALDFLAGS=-g @@ -122,8 +124,8 @@ SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD # four choices: Berkeley db b-tree, Berkeley db hash, GNU dbm, or ndbm. # # berkeley db btree package -#LDBMBACKEND=-DLDBM_USE_DBBTREE -#LDBMINCLUDE=-I/usr/local/db/include +LDBMBACKEND=-DLDBM_USE_DBBTREE +LDBMINCLUDE=-I/usr/include #LDBMLIB=-ldb # berkeley db hash package #LDBMBACKEND=-DLDBM_USE_DBHASH @@ -134,7 +136,7 @@ SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD #LDBMINCLUDE=-I/usr/local/gdbm/include #LDBMLIB=-lgdbm # standard unix ndbm -LDBMBACKEND=-DLDBM_USE_NDBM +#LDBMBACKEND=-DLDBM_USE_NDBM # # if you want to use a non-default threads package change these lines #THREADS=-DNO_THREADS diff --git a/clients/Make-template b/clients/Make-template index 76a02d5a26..8be29e500e 100644 --- a/clients/Make-template +++ b/clients/Make-template @@ -22,7 +22,7 @@ all: FORCE @echo "making all in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ ( cd $$i; $(MAKE) $(MFLAGS) all ); \ fi; \ @@ -36,7 +36,7 @@ all: FORCE install: FORCE @echo "making install in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ ( cd $$i; $(MAKE) $(MFLAGS) install ); \ fi; \ @@ -49,7 +49,7 @@ install: FORCE clean: FORCE @echo "making clean in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ fi; \ @@ -65,7 +65,7 @@ veryclean: clean depend: FORCE @echo "making depend in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ fi; \ @@ -74,7 +74,7 @@ depend: FORCE links: @echo "making links in `$(PWD)`"; \ for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ + if [ -d $$i -a $$i != ".src/CVS" ]; then \ d=`basename $$i`; \ ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ $(LN) ../.src/$$d/Make-template . ; \ diff --git a/doc/Make-template b/doc/Make-template index 1dea71cc90..0eefcfe18e 100644 --- a/doc/Make-template +++ b/doc/Make-template @@ -22,7 +22,7 @@ all: FORCE @echo "making all in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ ( cd $$i; $(MAKE) $(MFLAGS) all ); \ fi; \ @@ -32,7 +32,7 @@ all: FORCE install: FORCE @echo "making install in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ ( cd $$i; $(MAKE) $(MFLAGS) install ); \ fi; \ @@ -42,7 +42,7 @@ install: FORCE clean: FORCE @echo "making clean in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ fi; \ @@ -55,7 +55,7 @@ veryclean: clean depend: FORCE @echo "making depend in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ fi; \ @@ -65,7 +65,7 @@ depend: FORCE lint: FORCE @echo "making lint in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) lint"; \ ( cd $$i; $(MAKE) $(MFLAGS) lint ); \ fi; \ @@ -75,7 +75,7 @@ lint: FORCE 5lint: FORCE @echo "making 5lint in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) 5lint"; \ ( cd $$i; $(MAKE) $(MFLAGS) 5lint ); \ fi; \ @@ -85,7 +85,7 @@ lint: FORCE links: @echo "making links in `$(PWD)`"; \ for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ + if [ -d $$i -a $$i != ".src/CVS" ]; then \ d=`basename $$i`; \ ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ $(LN) ../.src/$$d/Make-template . ; \ diff --git a/doc/man/Make-template b/doc/man/Make-template index e975170f3e..8d7f5bf1fa 100644 --- a/doc/man/Make-template +++ b/doc/man/Make-template @@ -22,7 +22,7 @@ all: FORCE @echo "making all in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ ( cd $$i; $(MAKE) $(MFLAGS) all ); \ fi; \ @@ -36,7 +36,7 @@ all: FORCE install: FORCE @echo "making install in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ ( cd $$i; $(MAKE) $(MFLAGS) install ); \ fi; \ @@ -49,7 +49,7 @@ install: FORCE clean: FORCE @echo "making clean in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ fi; \ @@ -65,7 +65,7 @@ veryclean: clean depend: FORCE @echo "making depend in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ fi; \ @@ -74,7 +74,7 @@ depend: FORCE links: @echo "making links in `$(PWD)`"; \ for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ + if [ -d $$i -a $$i != ".src/CVS" ]; then \ d=`basename $$i`; \ ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ $(LN) ../.src/$$d/Make-template . ; \ diff --git a/libraries/Make-template b/libraries/Make-template index 7f6c06df01..95169e554e 100644 --- a/libraries/Make-template +++ b/libraries/Make-template @@ -26,7 +26,7 @@ all: FORCE @echo "making all in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ ( cd $$i; $(MAKE) $(MFLAGS) all ); \ fi; \ @@ -40,7 +40,7 @@ all: FORCE install: FORCE @echo "making install in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ ( cd $$i; $(MAKE) $(MFLAGS) install ); \ fi; \ @@ -52,7 +52,7 @@ install: FORCE clean: FORCE @echo "making clean in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ fi; \ @@ -67,7 +67,7 @@ veryclean: clean depend: FORCE @echo "making depend in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ fi; \ @@ -76,7 +76,7 @@ depend: FORCE links: @echo "making links in `$(PWD)`"; \ for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ + if [ -d $$i -a $$i != ".src/CVS" ]; then \ d=`basename $$i`; \ ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ $(LN) ../.src/$$d/Make-template . ; \ diff --git a/servers/Make-template b/servers/Make-template index 39eb1240f1..6dbca325ad 100644 --- a/servers/Make-template +++ b/servers/Make-template @@ -26,7 +26,7 @@ all: FORCE @echo "making all in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ ( cd $$i; $(MAKE) $(MFLAGS) all ); \ fi; \ @@ -40,7 +40,7 @@ all: FORCE install: FORCE @echo "making install in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ ( cd $$i; $(MAKE) $(MFLAGS) install ); \ fi; \ @@ -53,7 +53,7 @@ install: FORCE clean: FORCE @echo "making clean in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ fi; \ @@ -69,7 +69,7 @@ veryclean: clean depend: FORCE @echo "making depend in `$(PWD)`" @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ + if [ -d $$i -a $$i != "CVS" ]; then \ echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ fi; \ @@ -78,7 +78,7 @@ depend: FORCE links: @echo "making links in `$(PWD)`"; \ for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ + if [ -d $$i -a $$i != ".src/CVS" ]; then \ d=`basename $$i`; \ ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ $(LN) ../.src/$$d/Make-template . ; \ diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c index 4a6dc38237..28d1d09b58 100644 --- a/servers/slurpd/re.c +++ b/servers/slurpd/re.c @@ -31,7 +31,9 @@ extern char *str_getline( char **next ); extern void ch_free( char *p ); +#if !(defined(BSD) && (BSD >= 199306)) extern char *sys_errlist[]; +#endif /* Forward references */ static Rh *get_repl_hosts( char *, int *, char ** ); diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c index 54adb4da1a..2745d4fe78 100644 --- a/servers/slurpd/rq.c +++ b/servers/slurpd/rq.c @@ -44,9 +44,9 @@ extern void Re_dump( Re *re ); extern void Re_dump(); #endif /* NEEDPROTOS */ - +#if !(defined(BSD) && (BSD >= 199306)) extern char *sys_errlist[]; - +#endif /* * Lock the replication queue. diff --git a/tests/Make-template b/tests/Make-template index f8cae98bf0..7e49ed6c61 100644 --- a/tests/Make-template +++ b/tests/Make-template @@ -24,7 +24,7 @@ install: FORCE depend: FORCE clean: FORCE - $(RM) test-db/* test-repl/* + $(RM) test-db/[a-z]* test-repl/[a-z]* veryclean: clean