68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
--- udev-113/Makefile.lib64 2007-06-23 17:44:48.000000000 +0200
|
|
+++ udev-113/Makefile 2007-06-26 16:37:34.000000000 +0200
|
|
@@ -98,6 +98,8 @@
|
|
libudevdir = ${prefix}/lib/udev
|
|
mandir = ${prefix}/usr/share/man
|
|
configdir = ${etcdir}/udev
|
|
+libdir ?= ${prefix}/lib
|
|
+usrlibdir ?= ${prefix}/usr/lib
|
|
udevdir = /dev
|
|
DESTDIR =
|
|
|
|
@@ -168,6 +170,8 @@
|
|
RANLIB="$(RANLIB)" \
|
|
LIB_OBJS="$(LIB_OBJS)" \
|
|
LIBUDEV="$(PWD)/$(LIBUDEV)" \
|
|
+ libdir=$(libdir) \
|
|
+ usrlibdir=$(usrlibdir) \
|
|
-C $$target $@ || exit 1; \
|
|
done;
|
|
.PHONY: all
|
|
--- udev-113/extras/volume_id/lib/Makefile.lib64 2007-06-26 16:37:34.000000000 +0200
|
|
+++ udev-113/extras/volume_id/lib/Makefile 2007-06-26 16:37:34.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
|
|
@@ -106,6 +106,7 @@
|
|
$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
|
|
$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
|
|
mkdir -p $(DESTDIR)$(usrlibdir)/
|
|
+ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
|
|
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
|
|
--- udev-113/extras/volume_id/Makefile.lib64 2007-06-23 17:44:48.000000000 +0200
|
|
+++ udev-113/extras/volume_id/Makefile 2007-06-26 16:37:34.000000000 +0200
|
|
@@ -17,6 +17,9 @@
|
|
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 @@
|
|
$(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
|