Index: libcap2-2.11/Make.Rules
===================================================================
--- libcap2-2.11.orig/Make.Rules	2008-07-10 08:22:22.000000000 +0200
+++ libcap2-2.11/Make.Rules	2008-07-26 15:51:27.000000000 +0200
@@ -49,7 +49,7 @@
 AR := ar
 RANLIB := ranlib
 DEBUG = -g #-DDEBUG
-WARNINGS=-fPIC -Wall -Wwrite-strings \
+WARNINGS=-Wall -Wwrite-strings \
         -Wpointer-arith -Wcast-qual -Wcast-align \
         -Wstrict-prototypes -Wmissing-prototypes \
         -Wnested-externs -Winline -Wshadow
@@ -58,10 +58,10 @@
 
 KERNEL_HEADERS := $(topdir)/libcap/include
 SYSTEM_HEADERS = /usr/include
-IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+IPATH += -fPIC -Dlinux -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) 
 INCS=$(topdir)/libcap/include/sys/capability.h
-LDFLAGS += -L$(topdir)/libcap
-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
+LIBS += -L$(topdir)/libcap
+CFLAGS += $(WARNINGS) $(DEBUG)
 PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
 # Global cleanup stuff
 
Index: libcap2-2.11/libcap/Makefile
===================================================================
--- libcap2-2.11.orig/libcap/Makefile	2008-07-10 08:18:40.000000000 +0200
+++ libcap2-2.11/libcap/Makefile	2008-07-26 15:51:27.000000000 +0200
@@ -17,7 +17,7 @@
 MAJLIBNAME=$(LIBNAME).$(VERSION)
 MINLIBNAME=$(MAJLIBNAME).$(MINOR)
 GPERF_OUTPUT = _caps_output.gperf
-LDFLAGS += -lattr
+LIBS += -lattr
 
 all: $(MINLIBNAME) $(STALIBNAME)
 
@@ -27,7 +27,7 @@
 endif
 
 _makenames: _makenames.c cap_names.sed
-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
+	$(BUILD_CC) $(IPATH) $(BUILD_CFLAGS) $< -o $@
 
 cap_names.h: _makenames
 	./_makenames > cap_names.h
@@ -44,15 +44,15 @@
 	$(RANLIB) $@
 
 $(MINLIBNAME): $(OBJS)
-	$(LD) $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
+	$(LD) $(CFLAGS) $(LIBS) $(LDFLAGS) -Wl,-soname,$(MAJLIBNAME) -o $@ $^
 	ln -sf $(MINLIBNAME) $(MAJLIBNAME)
 	ln -sf $(MAJLIBNAME) $(LIBNAME)
 
 %.o: %.c $(INCLS)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(IPATH) $(CFLAGS) -c $< -o $@
 
 cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
-	$(CC) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
+	$(CC) $(IPATH) $(CFLAGS) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
 
 install: all
 	mkdir -p -m 0755 $(INCDIR)/sys
Index: libcap2-2.11/pam_cap/Makefile
===================================================================
--- libcap2-2.11.orig/pam_cap/Makefile	2008-07-10 08:18:40.000000000 +0200
+++ libcap2-2.11/pam_cap/Makefile	2008-07-26 15:52:00.000000000 +0200
@@ -3,8 +3,7 @@
 topdir=$(shell pwd)/..
 include ../Make.Rules
 
-LDLIBS += -lcap
-CFLAGS += -fPIC
+LDLIBS += -L../libcap -lcap
 
 all: pam_cap.so
 	$(MAKE) testcompile
@@ -17,10 +16,10 @@
 	$(LD) $(CFLAGS) -o pam_cap.so $< $(LDLIBS)
 
 pam_cap.o: pam_cap.c
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(IPATH) -fPIC $(CFLAGS) -c $< -o $@
 
 testcompile: test.c pam_cap.o
-	$(CC) $(CFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
+	$(CC) $(IPATH) $(CFLAGS) -o $@ $+ -lpam -ldl $(LDLIBS)
 
 clean:
 	rm -f *.o *.so testcompile *~
Index: libcap2-2.11/progs/Makefile
===================================================================
--- libcap2-2.11.orig/progs/Makefile	2008-07-10 08:18:40.000000000 +0200
+++ libcap2-2.11/progs/Makefile	2008-07-26 15:51:27.000000000 +0200
@@ -6,16 +6,15 @@
 #
 PROGS=getpcaps getcap setcap capsh
 
-LDFLAGS += --static 
 LDLIBS += -lcap
 
 all: $(PROGS)
 
 $(PROGS): %: %.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDLIBS)
+	$(CC) $(CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 %.o: %.c $(INCS)
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(IPATH) $(CFLAGS) -c $< -o $@
 
 install: all
 	mkdir -p -m 0755 $(SBINDIR)