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

This commit is contained in:
dmose%netscape.com 2002-04-24 23:53:23 +00:00
Родитель 3986f79f2c
Коммит db803b63ab
6 изменённых файлов: 21 добавлений и 1 удалений

Просмотреть файл

@ -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"

2
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:

Просмотреть файл

@ -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:

Просмотреть файл

@ -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))

Просмотреть файл

@ -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

Просмотреть файл

@ -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