Merge FreeBSD Make-templates into LDAPworld branch

diff --git a/Make-common b/Make-common
index 32683c7652d35b60ecd15a31077b643752b8a6ed..405842cc4fa9a0aedce8443db9ed3654cbabafbb 100644 (file)
--- 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 76a02d5a266c51bf459e86ae965c604e69bb394c..8be29e500e2223648174dd504a4029e274a33eb7 100644 (file)
--- 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 1dea71cc90b305638eb3edee61ef782ea762450f..0eefcfe18e8467e3df25bb29a0071484bef28cd0 100644 (file)
--- 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 e975170f3e25fabcfe9441a18800f5e4b4703571..8d7f5bf1fac243b7d15ea489a7e7411d38ddac8d 100644 (file)
--- 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 7f6c06df019057a2135fde9ac4f8c4bf77e20501..95169e554e57dc467e5252ae81d4ddeadb699f04 100644 (file)
--- 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 39eb1240f1aa3d0fe3ff9db99604eb0dbe2299ea..6dbca325adb1f0b726c502eb78aff03d91ed08b7 100644 (file)
--- 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 4a6dc382377247c1da34ff330d9170a69c274e01..28d1d09b58832841a0ee00723392bdc6842ebf49 100644 (file)
--- 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 54adb4da1af77e4fd26db6da62d375ea781e94c6..2745d4fe782ecd7e34d5feb93fa81494709a9e5e 100644 (file)
--- 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 f8cae98bf08ae7d4c83665094d4367e3c1217dee..7e49ed6c615f31a55d20049ff9dd132f1dc61509 100644 (file)
--- 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