From f682fd6985c22a0322645757a59a8a7b5d602352 Mon Sep 17 00:00:00 2001
From: "dmose%netscape.com" <dmose%netscape.com>
Date: Wed, 24 Apr 2002 23:53:23 +0000
Subject: [PATCH] Reinstate real_install target so that it will be possible to
 have an install target for Mozilla that works as expected (bug 138442); patch
 from Chris Seawood <cls@seawood.org>, r=dmose@netscape.com, mcs@netscape.com

---
 directory/c-sdk/config/rules.mk                      | 12 ++++++++++++
 directory/c-sdk/configure                            |  2 +-
 directory/c-sdk/ldap/include/Makefile.in             |  3 +++
 directory/c-sdk/ldap/libraries/libldap/Makefile.in   |  1 +
 directory/c-sdk/ldap/libraries/libprldap/Makefile.in |  2 ++
 directory/c-sdk/ldap/libraries/libssldap/Makefile.in |  2 ++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/directory/c-sdk/config/rules.mk b/directory/c-sdk/config/rules.mk
index baaf0ae8270..2df02472b5e 100644
--- a/directory/c-sdk/config/rules.mk
+++ b/directory/c-sdk/config/rules.mk
@@ -213,6 +213,18 @@ distclean::
 	rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
 	+$(LOOP_OVER_DIRS)
 
+real_install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
+ifdef RELEASE_BINS
+	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
+endif
+ifdef RELEASE_HEADERS
+	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)
+endif
+ifdef RELEASE_LIBS
+	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)
+endif
+	+$(LOOP_OVER_DIRS)
+
 release:: export
 ifdef RELEASE_BINS
 	@echo "Copying executable programs and scripts to release directory"
diff --git a/directory/c-sdk/configure b/directory/c-sdk/configure
index 7d66ca2c836..fa117a3a28a 100755
--- a/directory/c-sdk/configure
+++ b/directory/c-sdk/configure
@@ -6,7 +6,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:  
+# Defaults: 
 ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
diff --git a/directory/c-sdk/ldap/include/Makefile.in b/directory/c-sdk/ldap/include/Makefile.in
index 6e5f2054823..ba8d350dc63 100644
--- a/directory/c-sdk/ldap/include/Makefile.in
+++ b/directory/c-sdk/ldap/include/Makefile.in
@@ -57,6 +57,8 @@ PRIVATEHEADERS := $(addprefix $(srcdir)/, $(PRIVATEHEADERS))
 
 GENERATED_HEADERS = ldap-standard.h
 
+RELEASE_HEADERS	= $(HEADERS) $(GENHEADERS)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDEDIR	= $(DIST)/public/ldap
@@ -87,3 +89,4 @@ $(INCLUDEDIR)/ldap-standard.h:	ldap-standard-tmpl.h $(INCLUDEDIR)
 			< $< > $@
 
 FORCE:
+
diff --git a/directory/c-sdk/ldap/libraries/libldap/Makefile.in b/directory/c-sdk/ldap/libraries/libldap/Makefile.in
index 9da06d9cd82..c61a34adc85 100644
--- a/directory/c-sdk/ldap/libraries/libldap/Makefile.in
+++ b/directory/c-sdk/ldap/libraries/libldap/Makefile.in
@@ -84,6 +84,7 @@ ifeq ($(OS_ARCH),WINNT)
 SRCS		+= dllmain.c \
                    mozock.c
 endif
+RELEASE_LIBS	= $(SHARED_LIBRARY) $(DLLLDAP)
 
 REALOBJS	= $(SRCS:.c=.$(OBJ_SUFFIX))
 OBJS		= $(addprefix $(OBJDIR_NAME)/, $(REALOBJS))
diff --git a/directory/c-sdk/ldap/libraries/libprldap/Makefile.in b/directory/c-sdk/ldap/libraries/libprldap/Makefile.in
index 15c91ac7190..595945b55c8 100644
--- a/directory/c-sdk/ldap/libraries/libprldap/Makefile.in
+++ b/directory/c-sdk/ldap/libraries/libprldap/Makefile.in
@@ -50,6 +50,8 @@ DLLPRLDAP	= $(addprefix $(OBJDIR_NAME)/, \
 
 INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
 
+RELEASE_LIBS	= $(DLLPRLDAP)
+
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
diff --git a/directory/c-sdk/ldap/libraries/libssldap/Makefile.in b/directory/c-sdk/ldap/libraries/libssldap/Makefile.in
index d3048052702..365e5a5b8e0 100644
--- a/directory/c-sdk/ldap/libraries/libssldap/Makefile.in
+++ b/directory/c-sdk/ldap/libraries/libssldap/Makefile.in
@@ -44,6 +44,8 @@ DLLSSLDAP	= $(addprefix $(SSLOBJDEST)/, $(LIB_PREFIX)$(SSLDAP_LIBNAME).$(DLL_SUF
 
 INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
 
+RELEASE_LIBS	= $(DLLSSLDAP)
+
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = -I$(PUBLIC)/nspr