Actually `cvs add' needed patch for 3.1.4 this time.

Also optimize the Makefile a little more.

Submitted by:	naddy
This commit is contained in:
David E. O'Brien 2002-07-06 02:24:58 +00:00
parent e34c386acc
commit bc1a8c4a7c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=62500
2 changed files with 30 additions and 4 deletions

View File

@ -43,12 +43,12 @@ do-install:
@cd ${WRKSRC}/bin ; ${INSTALL_PROGRAM} \
ncftpbatch ncftpget ncftpls ncftpput ncftpbookmarks \
${PREFIX}/bin
@cd ${PREFIX}/bin && ${LN} ncftpbatch ncftpspooler
@${INSTALL_DATA} ${WRKSRC}/Strn/libStrn.so.1 ${PREFIX}/lib/${LIBSTRN}
@cd ${PREFIX}/lib && ${LN} -sf ${LIBSTRN} libStrn.so
@cd ${WRKSRC} && ${INSTALL_DATA} libncftp/${LIBNCFTP} sio/${LIBSIO} \
@cd ${PREFIX}/bin && ${LN} -f ncftpbatch ncftpspooler
@cd ${WRKSRC} && ${INSTALL_DATA} \
Strn/${LIBSTRN} libncftp/${LIBNCFTP} sio/${LIBSIO} \
${PREFIX}/lib
@cd ${PREFIX}/lib \
&& ${LN} -sf ${LIBSTRN} libStrn.so \
&& ${LN} -sf ${LIBNCFTP} libncftp.so \
&& ${LN} -sf ${LIBSIO} libsio.so
@${INSTALL_MAN} ${WRKSRC}/doc/man/ncftp.1 ${PREFIX}/man/man1/ncftp3.1

View File

@ -0,0 +1,26 @@
--- sio/Makefile.in.orig Fri Jun 28 03:09:26 2002
+++ sio/Makefile.in Fri Jul 5 11:26:55 2002
@@ -64,15 +64,19 @@
chmod a+r $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
-@/bin/ls -l $(PREFIX)/lib/$(LIB) $(PREFIX)/include/sio.h $(PREFIX)/include/usio.h
+dynamic: $(LIBSO)
+
shared: $(LIBSO)
so: $(LIBSO)
$(LIBSO): $(SOBJS)
- /bin/rm -f $(LIBSO)
- gcc -shared -Wl,-soname,$(LIBSO) -o $(LIBSO) $(SOBJS)
- chmod a+r $(LIB) sio.h usio.h
- -@/bin/ls -l $(LIBSO)
+ /bin/rm -f $(LIBSO) $(LIBSOS)
+ $(CC) -shared "-Wl,-soname,$(LIBSO)" -o "$(LIBSO)" $(SOBJS)
+ $(CC) -shared -Wl,-x -o $(LIBSO) `lorder $(SOBJS) | tsort -q`
+ chmod a+r $(LIBSO) sio.h usio.h
+ /bin/ln -s "$(LIBSO)" "$(LIBSOS)"
+ -@/bin/ls -l "$(LIBSOS)" "$(LIBSO)"
soinstall: $(LIBSO)
cp $(LIBSO) $(PREFIX)/lib/$(LIBSO)