[iptables] build: fix `make install` when --disable-shared is used

Patrick McHardy netfilter-cvslog-bounces at lists.netfilter.org
Thu Jun 12 12:23:47 CEST 2008


Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=e145621e88ef65d2c1f34f9225c4c0cb7e52516d
commit e145621e88ef65d2c1f34f9225c4c0cb7e52516d
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Jun 12 12:10:47 2008 +0200
Commit:     Patrick McHardy <kaber at trash.net>
CommitDate: Thu Jun 12 12:10:47 2008 +0200

    build: fix `make install` when --disable-shared is used
    
    When --disable-shared is used, there are no .so files to install, and
    the argument order for install would get messed up.
    
    Reported-by: Michael Teicher <mteicher at gmail.com>
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>
       via  e145621e88ef65d2c1f34f9225c4c0cb7e52516d (commit)
      from  48607816796124ce2177ee22645d3fd8180f1e98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e145621e88ef65d2c1f34f9225c4c0cb7e52516d
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Jun 12 12:10:47 2008 +0200

    build: fix `make install` when --disable-shared is used
    
    When --disable-shared is used, there are no .so files to install, and
    the argument order for install would get messed up.
    
    Reported-by: Michael Teicher <mteicher at gmail.com>
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Patrick McHardy <kaber at trash.net>

-----------------------------------------------------------------------

 extensions/GNUmakefile.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
When --disable-shared is used, there are no .so files to install, and
the argument order for install would get messed up.

Reported-by: Michael Teicher <mteicher at gmail.com>
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Patrick McHardy <kaber at trash.net>

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 8d44e4e..4a3bf4e 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -67,7 +67,7 @@ all: ${targets}
 
 install: ${targets_install}
 	@mkdir -p "${DESTDIR}${xtlibdir}";
-	install -pm0755 $^ "${DESTDIR}${xtlibdir}/";
+	if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
 
 clean:
 	rm -f *.o *.oo *.so *.a {matches,targets}[46].man initext4.c initext6.c;



More information about the netfilter-cvslog mailing list