Commit ae21b1ee authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Clean up sh commands in Makefiles (incorrect use of ';').

Fix make install problems.
parent 0c0f011d
Copyright (c) 1992-1996 Regents of the University of Michigan.
Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA
All rights reserved.
Redistribution and use in source and binary forms are permitted only
as authorized by the OpenLDAP Public License. A copy of this
license is available at http://www.OpenLDAP.org/license.html or
in file LICENSE in the top-level directory of the distribution.
This work is derived from the University of Michigan LDAP v3.3
distribution. Information concerning is available at
http://www.umich.edu/~dirsvcs/ldap/ldap.html.
This work also contains materials derived from public sources.
---
Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
All rights reserved.
Redistribution and use in source and binary forms are permitted
......
......@@ -22,7 +22,7 @@ install-common: install-local FORCE
clean-common: clean-local FORCE
@echo "Making clean in `$(PWD)`"
@for i in $(SUBDIRS) $(CLEANDIRS); do \
@for i in $(SUBDIRS) $(CLEANDIRS); do \
echo " Entering subdirectory $$i"; \
( cd $$i; $(MAKE) $(MFLAGS) clean ); \
echo " "; \
......@@ -30,7 +30,7 @@ clean-common: clean-local FORCE
veryclean-common: veryclean-local FORCE
@echo "Making veryclean in `$(PWD)`"
@for i in $(SUBDIRS) $(CLEANDIRS); do \
@for i in $(SUBDIRS) $(CLEANDIRS); do \
echo " Entering subdirectory $$i"; \
( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
echo " "; \
......@@ -38,7 +38,7 @@ veryclean-common: veryclean-local FORCE
depend-common: depend-local FORCE
@echo "Making depend in `$(PWD)`"
@for i in $(SUBDIRS) $(DEPENDDIRS); do \
@for i in $(SUBDIRS) $(DEPENDDIRS); do \
echo " Entering subdirectory $$i"; \
( cd $$i; $(MAKE) $(MFLAGS) depend ); \
echo " "; \
......
......@@ -30,6 +30,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
MV = mv
LN = ln
LN_S = @LN_S@
RM = rm -f
......
......@@ -21,4 +21,5 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND)
install: $(PROGRAMS) rcpt500.help FORCE
-$(MKDIR) -p $(libexecdir) $(sysconfdir)
$(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir)
-$(MV) $(sysconfdir)/rcpt500.help $(sysconfdir)/rcpt500.help-
$(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(sysconfdir)
This diff is collapsed.
......@@ -196,9 +196,6 @@ TERMCAP_LIBS=
dnl ----------------------------------------------------------------
dnl Checks for programs
AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
AC_PROG_LN_S
AC_PROG_INSTALL
AC_PROG_RANLIB
......@@ -209,6 +206,14 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
dnl Checks the compiler and UNIX Variants
AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
AC_AIX
AC_ISC_POSIX
AC_MINIX
dnl ----------------------------------------------------------------
dnl Checks for libraries
......@@ -738,6 +743,10 @@ AC_STRUCT_TM
dnl AC_C_BIGENDIAN
AC_C_CONST
dnl AC_CHECK_SIZEOF(short)
dnl AC_CHECK_SIZEOF(int)
dnl AC_CHECK_SIZEOF(long)
dnl ----------------------------------------------------------------
dnl Checks for library functions.
AC_FUNC_MEMCMP
......
......@@ -10,8 +10,6 @@ install-local: FORCE
$(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 ldap_cdefs.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 proto-lber.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 proto-ldap.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(includedir)
......
......@@ -4,9 +4,11 @@
#define _AC_WAIT_H
#include <sys/types.h>
#if HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
#ifndef WEXITSTATUS
# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
#endif
......
......@@ -15,6 +15,13 @@
#define _LDAP_PORTABLE_H
/* Define if on AIX 3.
System headers sometimes define this.
We just want to avoid a redefinition error message. */
#ifndef _ALL_SOURCE
#undef _ALL_SOURCE
#endif
/* Define to empty if the keyword does not work. */
#undef const
......@@ -43,6 +50,9 @@
/* Define if you have the wait3 system call. */
#undef HAVE_WAIT3
/* Define if on MINIX. */
#undef _MINIX
/* Define to `int' if <sys/types.h> doesn't define. */
#undef mode_t
......@@ -52,6 +62,13 @@
/* Define to `int' if <sys/types.h> doesn't define. */
#undef pid_t
/* Define if the system does not provide POSIX.1 features except
with this defined. */
#undef _POSIX_1_SOURCE
/* Define if you need to in order for stat and other things to work. */
#undef _POSIX_SOURCE
/* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE
......
/*
* Copyright (c) 1994 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and that due credit is given
* to the University of Michigan at Ann Arbor. The name of the University
* may not be used to endorse or promote products derived from this
* software without specific prior written permission. This software
* is provided ``as is'' without express or implied warranty.
*/
Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA
All rights reserved.
Redistribution and use in source and binary forms are permitted only
as authorized by the OpenLDAP Public License. A copy of this
license is available at http://www.OpenLDAP.org/license.html or
in file LICENSE in the top-level directory of the distribution.
This work is derived from the University of Michigan LDAP v3.3
distribution. Information concerning is available at
http://www.umich.edu/~dirsvcs/ldap/ldap.html.
This work also contains materials derived from public sources.
---
Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
All rights reserved.
Redistribution and use in source and binary forms are permitted
provided that this notice is preserved and that due credit is given
to the University of Michigan at Ann Arbor. The name of the University
may not be used to endorse or promote products derived from this
software without specific prior written permission. This software
is provided ``as is'' without express or implied warranty.
*/
#ifndef _LDAP_PORTABLE_H
#define _LDAP_PORTABLE_H
......
......@@ -11,14 +11,18 @@
* is provided ``as is'' without express or implied warranty.
*/
#define DISABLE_BRIDGE
#include "portable.h"
#ifndef lint
static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of Michigan.\nAll rights reserved.\n";
static char avl_version[] = "AVL library version 1.0\n";
#endif
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include "avl.h"
#define ROTATERIGHT(x) { \
......
......@@ -40,8 +40,6 @@
#include "msdos.h"
#endif /* DOS */
#include <string.h>
#include "lber.h"
#ifdef LDAP_DEBUG
......
......@@ -11,18 +11,20 @@
* is provided ``as is'' without express or implied warranty.
*/
#define DISABLE_BRIDGE
#include "portable.h"
#include <stdio.h>
#include <stdlib.h>
#include <ac/string.h>
#ifdef MACOS
#include <stdlib.h>
#include <console.h>
#else /* MACOS */
#include <sys/types.h>
#include <sys/socket.h>
#endif /* MACOS */
#include "lber.h"
static usage( char *name )
......
......@@ -4,8 +4,12 @@
* All rights reserved.
*/
#define DISABLE_BRIDGE
#include "portable.h"
#include <stdio.h>
#include <string.h>
#include <ac/string.h>
#ifdef MACOS
#include <stdlib.h>
#include <unix.h>
......@@ -15,6 +19,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#endif /* MACOS */
#include "lber.h"
static usage( char *name )
......
......@@ -11,6 +11,9 @@
* is provided ``as is'' without express or implied warranty.
*/
#define DISABLE_BRIDGE
#include "portable.h"
#include <stdio.h>
#include <psap.h>
#include <quipu/attr.h>
......
......@@ -19,7 +19,7 @@
#include <ac/string.h>
#include <ctype.h>
#include <unistd.h>
#include <ac/unistd.h>
#if defined( DOS ) || defined( _WIN32 )
#include "msdos.h"
......
......@@ -38,8 +38,8 @@ install-local: $(LIBRARY) $(CFFILES) FORCE
-$(MKDIR) -p $(sysconfdir)
@for i in $(CFFILES); do \
echo "installing $$i in $(sysconfdir)"; \
if test -f $(sysconfdir)$$i; then \
$(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i- ; \
fi ; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir) ; \
if test -f $(sysconfdir)/$$i; then \
$(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i-; \
fi; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir); \
done
......@@ -84,7 +84,7 @@ version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
clean-local: FORCE
@for i in back-* tools; do \
if [ -d $$i ] ; then \
if [ -d $$i ]; then \
echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \
( cd $$i; $(MAKE) $(MFLAGS) clean ); \
fi; \
......
......@@ -107,7 +107,7 @@ clean-local: FORCE
$(RM) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) edb2-vers.c *.o a.out core
depend-local: FORCE
@DEPEND=no ; DEPEND_LDBM= ; DEPEND_ISODE= ;\
@DEPEND=no ; DEPEND_LDBM= ; DEPEND_ISODE= ; \
if [ "$(BUILD_LDBM)" = "yes" ]; then \
DEPEND_LDBM="$(SRCS)"; \
DEPEND=yes ; \
......@@ -117,26 +117,26 @@ depend-local: FORCE
DEPEND=yes ; \
fi; \
if [ "$$DEPEND" = "yes" ]; then \
$(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE $$DEPEND_LDBM \
$(MKDEP) $(DEFS) $(DEFINES) $$DEPEND_ISODE $$DEPEND_LDBM; \
else \
exit 0 ; \
exit 0; \
fi
install-local: install-ldbm install-isode FORCE
install-ldbm: FORCE
@-$(MKDIR) -p $(sbindir)
@-$(MKDIR) -p $(sbindir)
@if [ "$(BUILD_LDBM)" = "yes" ]; then \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir) \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir) ; \
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(sbindir) ; \
else \
exit 0; \
exit 0 ; \
fi
install-isode: FORCE
......@@ -145,7 +145,7 @@ install-isode: FORCE
$(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
$(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \
else \
exit 0; \
exit 0 ; \
fi
all-common: all-local FORCE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment