summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2000-02-21 11:38:00 +0000
committerKris Kennaway <kris@FreeBSD.org>2000-02-21 11:38:00 +0000
commit77199efb13048733af3da8c104a3e367cc700b55 (patch)
tree0b8a0f403845620a814684ba8685bc2d1d198a28 /security
parentUpgrade to 1.0.7. (diff)
Oops, previous commit broke installing. Fix this and reorganise a bit
more.
Notes
Notes: svn path=/head/; revision=26084
Diffstat (limited to 'security')
-rw-r--r--security/rsaref/Makefile10
-rw-r--r--security/rsaref/files/Makefile9
2 files changed, 8 insertions, 11 deletions
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 5dfe34c7d446..b6658c6acea9 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -31,8 +31,14 @@ pre-configure:
${CP} md2.h _md2.h && \
${CP} md5.h _md5.h
-post-install:
- ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+do-install:
+.for file in rsa.h _des.h _md2.h _md5.h rsaref.h global.h
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/include
+.endfor
+ ${INSTALL_DATA} ${WRKSRC}/librsaref.a ${WRKSRC}/librsaref.so.2 \
+ ${PREFIX}/lib
+ ln -sf librsaref.so.2 ${PREFIX}/lib/librsaref.so
+ ${LDCONFIG} -m ${PREFIX}/lib
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/rsaref
.for file in info.txt rsaref.txt
diff --git a/security/rsaref/files/Makefile b/security/rsaref/files/Makefile
index 6ea73883d563..14143e227118 100644
--- a/security/rsaref/files/Makefile
+++ b/security/rsaref/files/Makefile
@@ -10,11 +10,7 @@ LIB= ar
${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
RSAREFLIB=librsaref.a
-.if ${PORTOBJFORMAT} == elf
SORSAREFLIB=librsaref.so.2
-.else
-SORSAREFLIB=librsaref.so.2.0
-.endif
all: ${RSAREFLIB} ${SORSAREFLIB}
@@ -32,8 +28,3 @@ $(SORSAREFLIB) : desc.$(SO) digit.$(SO) md2c.$(SO) md5c.$(SO) nn.$(SO) prime.$(S
.else
ld -Bshareable -x -o $@ $>
.endif
-
-install:
- ${INSTALL_DATA} rsa.h _des.h _md2.h _md5.h rsaref.h global.h ${PREFIX}/include
- ${INSTALL_DATA} ${RSAREFLIB} ${SORSAREFLIB} ${PREFIX}/lib
- ln -sf ${SORSAREFLIB} ${PREFIX}/lib/librsaref.so