Author: sparky Date: Thu Nov 23 21:48:37 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use rpmldflags
- use -C in make and module building
---- Files affected:
SPECS:
p2p.spec (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.20 SPECS/p2p.spec:1.21
--- SPECS/p2p.spec:1.20 Thu Nov 23 21:05:59 2006
+++ SPECS/p2p.spec Thu Nov 23 22:48:32 2006
@@ -106,30 +106,26 @@
# iptables module
# IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
IPTABLES_VERSION="%{iptables_ver}"
-cd iptables
-cat << 'EOF' > Makefile
+cat << 'EOF' > iptables/Makefile
CC = %{__cc}
CFLAGS = %{rpmcflags} -fPIC -DIPTABLES_VERSION=\"%{iptables_ver}\"
#"-vim
INCPATH = -I../common
-LD = %{__ld}
+LDFLAGS = %{rpmldflags}
.SUFFIXES: .c .o .so
.c.o:
$(CC) $(CFLAGS) $(INCPATH) -c -o $@ $<
.o.so:
- $(LD) -shared -o $@ $<
+ $(CC) $(LDFLAGS) -shared -o $@ $<
all: libipt_p2p.so
EOF
-%{__make}
-cd ..
+%{__make} -C iptables
%endif
%if %{with kernel}
# kernel module(s)
-cd kernel
-cp ../common/ipt_p2p.h .
-%build_kernel_modules -m ipt_p2p
-cd ..
+cp common/ipt_p2p.h kernel
+%build_kernel_modules -C kernel -m ipt_p2p
%endif
%install
@@ -183,6 +179,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2006/11/23 21:48:32 sparky
+- use rpmldflags
+- use -C in make and module building
+
Revision 1.20 2006/11/23 20:05:59 hawk
- use %build_kernel_modules, %install_kernel_modules
- alt_kernel support
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/p2p.spec?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
