diff options
Diffstat (limited to 'src/lib/libcrypto/bf/Makefile.uni')
-rw-r--r-- | src/lib/libcrypto/bf/Makefile.uni | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/lib/libcrypto/bf/Makefile.uni b/src/lib/libcrypto/bf/Makefile.uni index 9ba5b0c854..f67e5ca23b 100644 --- a/src/lib/libcrypto/bf/Makefile.uni +++ b/src/lib/libcrypto/bf/Makefile.uni | |||
@@ -29,6 +29,7 @@ CFLAG= -O3 -fomit-frame-pointer | |||
29 | CFLAGS=$(OPTS) $(CFLAG) | 29 | CFLAGS=$(OPTS) $(CFLAG) |
30 | CPP=$(CC) -E | 30 | CPP=$(CC) -E |
31 | AS=as | 31 | AS=as |
32 | RANLIB=ranlib | ||
32 | 33 | ||
33 | # Assember version of bf_encrypt(). | 34 | # Assember version of bf_encrypt(). |
34 | BF_ENC=bf_enc.o # normal C version | 35 | BF_ENC=bf_enc.o # normal C version |
@@ -105,9 +106,7 @@ test: all | |||
105 | $(BLIB): $(LIBOBJ) | 106 | $(BLIB): $(LIBOBJ) |
106 | /bin/rm -f $(BLIB) | 107 | /bin/rm -f $(BLIB) |
107 | ar cr $(BLIB) $(LIBOBJ) | 108 | ar cr $(BLIB) $(LIBOBJ) |
108 | -if test -s /bin/ranlib; then /bin/ranlib $(BLIB); \ | 109 | $(RANLIB) $(BLIB) |
109 | else if test -s /usr/bin/ranlib; then /usr/bin/ranlib $(BLIB); \ | ||
110 | else exit 0; fi; fi | ||
111 | 110 | ||
112 | bftest: bftest.o $(BLIB) | 111 | bftest: bftest.o $(BLIB) |
113 | $(CC) $(CFLAGS) -o bftest bftest.o $(BLIB) | 112 | $(CC) $(CFLAGS) -o bftest bftest.o $(BLIB) |
@@ -142,25 +141,14 @@ install: $(BLIB) | |||
142 | if test $(INSTALLTOP); then \ | 141 | if test $(INSTALLTOP); then \ |
143 | echo SSL style install; \ | 142 | echo SSL style install; \ |
144 | cp $(BLIB) $(INSTALLTOP)/lib; \ | 143 | cp $(BLIB) $(INSTALLTOP)/lib; \ |
145 | if test -s /bin/ranlib; then \ | 144 | $(RANLIB) $(BLIB); \ |
146 | /bin/ranlib $(INSTALLTOP)/lib/$(BLIB); \ | ||
147 | else \ | ||
148 | if test -s /usr/bin/ranlib; then \ | ||
149 | /usr/bin/ranlib $(INSTALLTOP)/lib/$(BLIB); \ | ||
150 | fi; fi; \ | ||
151 | chmod 644 $(INSTALLTOP)/lib/$(BLIB); \ | 145 | chmod 644 $(INSTALLTOP)/lib/$(BLIB); \ |
152 | cp blowfish.h $(INSTALLTOP)/include; \ | 146 | cp blowfish.h $(INSTALLTOP)/include; \ |
153 | chmod 644 $(INSTALLTOP)/include/blowfish.h; \ | 147 | chmod 644 $(INSTALLTOP)/include/blowfish.h; \ |
154 | else \ | 148 | else \ |
155 | echo Standalone install; \ | 149 | echo Standalone install; \ |
156 | cp $(BLIB) $(LIBDIR)/$(BLIB); \ | 150 | cp $(BLIB) $(LIBDIR)/$(BLIB); \ |
157 | if test -s /bin/ranlib; then \ | 151 | $(RANLIB) $(BLIB); \ |
158 | /bin/ranlib $(LIBDIR)/$(BLIB); \ | ||
159 | else \ | ||
160 | if test -s /usr/bin/ranlib; then \ | ||
161 | /usr/bin/ranlib $(LIBDIR)/$(BLIB); \ | ||
162 | fi; \ | ||
163 | fi; \ | ||
164 | chmod 644 $(LIBDIR)/$(BLIB); \ | 152 | chmod 644 $(LIBDIR)/$(BLIB); \ |
165 | cp blowfish.h $(INCDIR)/blowfish.h; \ | 153 | cp blowfish.h $(INCDIR)/blowfish.h; \ |
166 | chmod 644 $(INCDIR)/blowfish.h; \ | 154 | chmod 644 $(INCDIR)/blowfish.h; \ |