diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 22:35:50 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 22:35:50 +0000 |
| commit | 71bd2e401b4c2477a02648000ca830907f8b3eda (patch) | |
| tree | 29656a590ec03a957934f5514826abb087519519 | |
| parent | 0b00cd4edc87f82fddde3a089d16f2e416305209 (diff) | |
| download | ds-71bd2e401b4c2477a02648000ca830907f8b3eda.tar.gz ds-71bd2e401b4c2477a02648000ca830907f8b3eda.tar.xz ds-71bd2e401b4c2477a02648000ca830907f8b3eda.zip | |
Whoops. Checked in some private stuff I had to work around vsftpd problems.
| -rw-r--r-- | components.mk | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/components.mk b/components.mk index 65e81c4d..8fab4bad 100644 --- a/components.mk +++ b/components.mk @@ -332,8 +332,7 @@ BINS_TO_PKG_SHARED += $(SECURITY_TOOLS_FULLPATH) # SECURITYLINK += $(OSF1SECURITYHACKOBJ) #endif -#SECURITY_FILES=lib,include,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS)) -SECURITY_FILES=lib,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS)) +SECURITY_FILES=lib,include,bin/$(subst $(SPACE),$(COMMA)bin/,$(SECURITY_TOOLS)) ifndef SECURITY_PULL_METHOD SECURITY_PULL_METHOD = $(COMPONENT_PULL_METHOD) @@ -345,9 +344,6 @@ ifdef COMPONENT_DEPS $(FTP_PULL) -method $(SECURITY_PULL_METHOD) \ -objdir $(SECURITY_BUILD_DIR) -componentdir $(SECURITY_IMPORT) \ -files $(SECURITY_FILES) - $(FTP_PULL) -method $(SECURITY_PULL_METHOD) \ - -objdir $(SECURITY_BUILD_DIR) -componentdir $(SECURITY_IMPORT)/.. \ - -files include endif -@if [ ! -f $@ ] ; \ then echo "Error: could not get component NSS file $@" ; \ @@ -801,9 +797,8 @@ endif $(JSS_DEP): $(CLASS_DEST) ifdef COMPONENT_DEPS $(FTP_PULL) -method $(JSS_PULL_METHOD) \ - -objdir $(CLASS_DEST)/jss -componentdir $(JSS_RELEASE) \ - -files xpclass.jar - mv $(CLASS_DEST)/jss/xpclass.jar $(CLASS_DEST)/$(JSSJAR) + -objdir $(CLASS_DEST) -componentdir $(JSS_RELEASE) \ + -files $(JSSJAR) endif -@if [ ! -f $@ ] ; \ then echo "Error: could not get component JSS file $@" ; \ @@ -896,10 +891,7 @@ $(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL) ifdef COMPONENT_DEPS $(FTP_PULL) -method $(SASL_PULL_METHOD) \ -objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \ - -files lib - $(FTP_PULL) -method $(SASL_PULL_METHOD) \ - -objdir $(SASL_BUILD_DIR)/include -componentdir $(SASL_RELEASE)/../public \ - -files .\* + -files lib,include endif -@if [ ! -f $@ ] ; \ then echo "Error: could not get component SASL file $@" ; \ |