--- pcmciautils-005/Makefile.foo	2005-07-08 22:03:40.000000000 -0400
+++ pcmciautils-005/Makefile	2005-07-08 22:05:02.000000000 -0400
@@ -96,8 +96,7 @@
 GCC_LIB := $(shell $(CC) -print-libgcc-file-name )
 
 # use '-Os' optimization if available, else use -O2
-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
-		then echo "-Os"; else echo "-O2" ; fi}
+OPTIMIZATION := $(RPM_OPT_FLAGS)
 
 # check if compiler option is supported
 cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;}
@@ -134,24 +133,12 @@
 LIB_PCI_OBJS = -lc -lpci
 #LDFLAGS =
 
-ifeq ($(strip $(V)),false)
-	QUIET=@$(PWD)/build/ccdv
-	HOST_PROGS=build/ccdv
-else
-	QUIET=
-	HOST_PROGS=
-endif
+QUIET=
+HOST_PROGS=
 
-# if DEBUG is enabled, then we do not strip or optimize
-ifeq ($(strip $(DEBUG)),true)
-	CFLAGS  += -O1 -g -DDEBUG -D_GNU_SOURCE
-	LDFLAGS += -Wl,-warn-common
-	STRIPCMD = /bin/true -Since_we_are_debugging
-else
-	CFLAGS  += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
-	LDFLAGS += -s -Wl,-warn-common
-	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
-endif
+CFLAGS  += $(OPTIMIZATION) -D_GNU_SOURCE
+LDFLAGS += -Wl,-warn-common
+STRIPCMD = /bin/true
 
 # if STARTUP is disabled, we can skip a few things
 ifeq ($(strip $(STARTUP)),false)
@@ -165,7 +152,7 @@
 endif
 
 
-all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
+all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules
 
 ccdv:
 	@echo "Building ccdv"
--- pcmciautils-006/Makefile.foo	2005-07-20 17:25:13.000000000 -0400
+++ pcmciautils-006/Makefile	2005-07-20 17:28:02.000000000 -0400
@@ -129,8 +129,8 @@
 
 #LIBC =
 CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
-LIB_OBJS = -lc -lsysfs
-LIB_PCI_OBJS = -lc -lpci
+LIB_OBJS =  -Wl,-Bstatic -lsysfs -Wl,-Bdynamic
+LIB_PCI_OBJS =  -lpci
 #LDFLAGS =
 
 QUIET=