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