Re: [PATCH 2/2] Fixed installation path for 64-bit libvolume_id.so

[Harald Hoyer <harald@redhat.com>]

[-- Attachment #1.1: Type: text/plain, Size: 203 bytes --]

Thomas Koeller wrote:
> Installing 64-bit libraries in /lib and /usr/lib
> is wrong.
> 

Fedora has the attached patch and builds on 64bit systems with:
$ make libdir="/lib64" usrlibdir="/usr/lib64" ...

[-- Attachment #1.2: udev-091-lib64.patch --]
[-- Type: text/plain, Size: 2346 bytes --]

diff -up udev-120/extras/volume_id/lib/Makefile.lib64 udev-120/extras/volume_id/lib/Makefile
--- udev-120/extras/volume_id/lib/Makefile.lib64	2008-04-04 14:13:33.000000000 +0200
+++ udev-120/extras/volume_id/lib/Makefile	2008-04-04 14:15:05.000000000 +0200
@@ -4,9 +4,9 @@
 #
 # Released under the GNU General Public License, version 2.
 #
-includedir = 	${prefix}/usr/include
-libdir =	${prefix}/lib
-usrlibdir =	${prefix}/usr/lib
+includedir ?= 	${prefix}/usr/include
+libdir ?=	${prefix}/lib
+usrlibdir ?=	${prefix}/usr/lib
 
 INSTALL = install -c
 INSTALL_DATA  = ${INSTALL} -m 644
@@ -115,6 +115,7 @@ ifeq ($(libdir),$(usrlibdir))
 else
 	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
 endif
+	$(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
 	$(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
 	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
 .PHONY: install
diff -up udev-120/extras/volume_id/Makefile.lib64 udev-120/extras/volume_id/Makefile
--- udev-120/extras/volume_id/Makefile.lib64	2008-04-03 21:12:53.000000000 +0200
+++ udev-120/extras/volume_id/Makefile	2008-04-04 14:13:33.000000000 +0200
@@ -17,6 +17,9 @@ usrsbindir =	${prefix}/usr/sbin
 libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
+libdir ?=       ${prefix}/lib
+usrlibdir ?=    ${prefix}/usr/lib
+
 
 INSTALL = install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -34,7 +37,11 @@ all: lib $(PROG) $(MAN_PAGES)
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
 lib:
-	$(Q) $(MAKE) -C $@
+	$(Q) $(MAKE) \
+		libdir=$(libdir) \
+		usrlibdir=$(usrlibdir) \
+		-C lib
+#	$(Q) $(MAKE) -C $@
 .PHONY: lib
 
 lib/libvolume_id.a: lib
diff -up udev-120/Makefile.lib64 udev-120/Makefile
--- udev-120/Makefile.lib64	2008-04-03 21:12:53.000000000 +0200
+++ udev-120/Makefile	2008-04-04 14:13:33.000000000 +0200
@@ -91,6 +91,8 @@ usrbindir =	${prefix}/usr/bin
 libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev
+libdir ?= 	${prefix}/lib
+usrlibdir ?= 	${prefix}/usr/lib
 udevdir =	/dev
 DESTDIR =
 
@@ -161,6 +163,8 @@ all: $(PROGRAMS) $(MAN_PAGES)
 			RANLIB="$(RANLIB)" \
 			LIB_OBJS="$(LIB_OBJS)" \
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
+			libdir=$(libdir) \
+			usrlibdir=$(usrlibdir) \
 			-C $$target $@ || exit 1; \
 	done;
 .PHONY: all

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3636 bytes --]