| 1 |
jer 08/08/25 02:17:13 |
| 2 |
|
| 3 |
Modified: ncftp-3.2.2-build.patch |
| 4 |
Log: |
| 5 |
Do not install $D/ESTDIR. |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7-JeR i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 net-ftp/ncftp/files/ncftp-3.2.2-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/ncftp/files/ncftp-3.2.2-build.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/ncftp/files/ncftp-3.2.2-build.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/ncftp/files/ncftp-3.2.2-build.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: ncftp-3.2.2-build.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/ncftp/files/ncftp-3.2.2-build.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- ncftp-3.2.2-build.patch 24 Aug 2008 17:33:03 -0000 1.2 |
| 22 |
+++ ncftp-3.2.2-build.patch 25 Aug 2008 02:17:12 -0000 1.3 |
| 23 |
@@ -1,14 +1,18 @@ |
| 24 |
+The first change makes sure $D/ESTDIR isn't created. |
| 25 |
+ |
| 26 |
The original build system assumes that in DESTDIR, a mandir (say, |
| 27 |
/usr/share/man) already exists. Using -p may not be compatible, but then again |
| 28 |
this is a Gentoo specific patch. -JeR |
| 29 |
|
| 30 |
---- Makefile.in.orig 2008-08-24 18:59:47.000000000 +0200 |
| 31 |
-+++ Makefile.in 2008-08-24 19:01:45.000000000 +0200 |
| 32 |
-@@ -44,7 +44,7 @@ |
| 33 |
+--- Makefile.in.orig 2008-08-25 04:10:21.000000000 +0200 |
| 34 |
++++ Makefile.in 2008-08-25 04:11:51.000000000 +0200 |
| 35 |
+@@ -43,8 +43,8 @@ |
| 36 |
+ @( cd ./ncftp ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) |
| 37 |
@( cd ./sh_util ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) |
| 38 |
@( cd ./vis ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" ) |
| 39 |
- -@test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null |
| 40 |
+- -@test -z "$(DESTDIR)" || mkdir -p "$DESTDIR" 2>/dev/null |
| 41 |
- -mkdir "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null |
| 42 |
++ -@test -z "$(DESTDIR)" || mkdir -p "$(DESTDIR)" 2>/dev/null |
| 43 |
+ -mkdir -p "$(DESTDIR)$(prefix)" "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(SYSCONFDIR)" "$(DESTDIR)$(mandir)/man1" 2>/dev/null |
| 44 |
-@echo '..... Installing the programs .....' |
| 45 |
$(INSTALL_PROGRAM) bin/ncftp@EXEEXT@ "$(DESTDIR)$(BINDIR)/ncftp@EXEEXT@" |
Archives