rpms/udev/devel udev-089-nopie.patch,1.4,1.5

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22588

Modified Files:
	udev-089-nopie.patch 
Log Message:
correction for shlib

udev-089-nopie.patch:
 Makefile |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-089-nopie.patch	13 Apr 2006 10:36:46 -0000	1.4
+++ udev-089-nopie.patch	13 Apr 2006 12:37:35 -0000	1.5
@@ -1,19 +1,28 @@
 --- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 12:31:51.000000000 +0200
-@@ -65,9 +65,11 @@
++++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 14:36:08.000000000 +0200
+@@ -54,7 +54,7 @@
+ 	libvolume_id.h		\
+ 	util.h
+ 
+-all: libvolume_id.a $(SHLIB) libvolume_id.pc
++all: libvolume_id.a 
+ .PHONY: all
+ .DEFAULT: all
+ 
+@@ -65,9 +65,10 @@
  .shlib:
  	$(Q) mkdir .shlib
  
 +SHCFLAGS:=$(shell echo $(CFLAGS) -fpic -fPIC|sed -e 's/-pie//g')
 +
  .shlib/%.o: %.c
- 	$(E) "  CC      " $@
+-	$(E) "  CC      " $@
 -	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
-+	$(Q) $(CC) -c $(SHCFLAGS)  $< -o $@
++	$(CC) -c $(SHCFLAGS)  $< -o $@
  
  libvolume_id.a: $(HEADERS) $(OBJS)
  	$(Q) rm -f $@
-@@ -76,9 +78,11 @@
+@@ -76,9 +77,11 @@
  	$(E) "  RANLIB  " $@
  	$(Q) $(RANLIB) $@
  
@@ -26,3 +35,22 @@
  		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
  		$(addprefix .shlib/,$(OBJS))
  	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)
+@@ -97,12 +100,12 @@
+ 	$(Q) echo "Cflags: -I\$${includedir}" >> $@
+ 
+ install: all
+-	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
+-	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
+-	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
+-	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+-	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+-	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
++	#$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
++	#$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
++	#$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
++	#ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
++	#ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
++	#$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
+ .PHONY: install
+ 
+ uninstall: