Contents of /trunk/ncftp/patches/ncftp-3.2.1-build.patch
Parent Directory | Revision Log
Revision 564 -
(show annotations)
(download)
Thu Apr 10 18:23:40 2008 UTC (16 years, 5 months ago) by niro
File size: 2769 byte(s)
Thu Apr 10 18:23:40 2008 UTC (16 years, 5 months ago) by niro
File size: 2769 byte(s)
-fixes build and install issues
1 | Fix DESTDIR and parallel build bugs |
2 | |
3 | http://bugs.gentoo.org/147371 |
4 | |
5 | --- ncftp-3.2.1/Makefile.in |
6 | +++ ncftp-3.2.1/Makefile.in |
7 | @@ -43,8 +43,8 @@ |
8 | @( cd ./ncftp ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) |
9 | @( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) |
10 | @( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) |
11 | - -@test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null |
12 | - -mkdir "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null |
13 | + -@test -z "$(DESTDIR)" || mkdir -p "$(DESTDIR)" 2>/dev/null |
14 | + -mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null |
15 | -@echo '..... Installing the programs .....' |
16 | $(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp@EXEEXT@" |
17 | $(INSTALL_PROGRAM) bin/ncftpget@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpget@EXEEXT@" |
18 | @@ -52,7 +52,7 @@ |
19 | $(INSTALL_PROGRAM) bin/ncftpls@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpls@EXEEXT@" |
20 | $(INSTALL_PROGRAM) bin/ncftpbatch@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftpbatch@EXEEXT@" |
21 | -@test -f "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" && echo /bin/rm "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" && /bin/rm "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" |
22 | - ln "$(DESTDIR)$(BINDIR)/ncftpbatch@EXEEXT@" "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" |
23 | + ln -s "ncftpbatch@EXEEXT@" "$(DESTDIR)$(BINDIR)/ncftpspooler@EXEEXT@" |
24 | # |
25 | # The visual programs are only built if a working Curses was found. |
26 | # |
27 | --- ncftp-3.2.1/sio/Makefile.in |
28 | +++ ncftp-3.2.1/sio/Makefile.in |
29 | @@ -180,6 +180,7 @@ |
30 | SClose.o: SClose.c $(SYSHDRS_DEP) |
31 | SConnect.o: SConnect.c $(SYSHDRS_DEP) |
32 | SConnectByName.o: SConnectByName.c $(SYSHDRS_DEP) |
33 | +SError.o: SError.c $(SYSHDRS_DEP) |
34 | SNew.o: SNew.c $(SYSHDRS_DEP) |
35 | SRead.o: SRead.c $(SYSHDRS_DEP) |
36 | SReadline.o: SReadline.c $(SYSHDRS_DEP) |
37 | --- ncftp-3.2.1/libncftp/pch.mk.gcc-gch |
38 | +++ ncftp-3.2.1/libncftp/pch.mk.gcc-gch |
39 | @@ -1,5 +1,6 @@ |
40 | syshdrs.h.gch: syshdrs.h ncftp.h ncftp_errno.h util.h ftp.h |
41 | - $(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h |
42 | + $(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h -o .tmp.$@ |
43 | + mv -f .tmp.$@ $@ |
44 | |
45 | PCH=syshdrs.h.gch |
46 | SYSHDRS_DEP=syshdrs.h.gch |
47 | --- ncftp-3.2.1/libncftp/Makefile.in |
48 | +++ ncftp-3.2.1/libncftp/Makefile.in |
49 | @@ -354,3 +354,6 @@ |
50 | |
51 | u_unmdtm.o: u_unmdtm.c $(SYSHDRS_DEP) |
52 | u_unmdtm.so: u_unmdtm.c $(SYSHDRS_DEP) |
53 | + |
54 | +u_feat.o: u_feat.c $(SYSHDRS_DEP) |
55 | +u_feat.so: u_feat.c $(SYSHDRS_DEP) |
56 | --- ncftp-3.2.1/sio/pch.mk.gcc-gch |
57 | +++ ncftp-3.2.1/sio/pch.mk.gcc-gch |
58 | @@ -1,5 +1,6 @@ |
59 | syshdrs.h.gch: syshdrs.h sio.h usio.h |
60 | - $(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h |
61 | + $(CCDV) $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) syshdrs.h -o .tmp.$@ |
62 | + mv -f .tmp.$@ $@ |
63 | |
64 | PCH=syshdrs.h.gch |
65 | SYSHDRS_DEP=syshdrs.h.gch |