Changeset 0bb66b1

Timestamp:

09/16/06 20:47:20 (7 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

('master', '5ea4e55860c61746fb61f12cd3c83d270ee17451')('clfs-1.2', '0d1a577466382847256b44170acecbd2e8cdc0c5')('simp', '271d1f963630b9cb390baf1ee2d8bdfe7d14e340')('systemd', 'ec008670fee2dc8086a6ce805d4831378d59895d')

Children:

80a92ecc424e4eb02ab2d58f3582e33a4af6793d

Parents:

e2f416c9acfe5c13c3741d0f17b0bc1074532747

git-author:

Jim Gifford <clfs@jg555.com>2006-09-16 20:47:20+00:00

git-committer:

Jim Gifford <clfs@jg555.com>2006-09-16 20:47:20+00:00

Message:

Added LIBDIR= to udev rules install

File:

• udev/Makefile (modified) (5 diffs)

udev/Makefile

@@ -4 +4 @@
 RULESMODE=644
 CONFMODE=644
+LIBDIR=lib
 
 all: help
@@ -30 +31 @@
 
 scripts:
-        install -m ${SCRIPTMODE} load_floppy_module.sh ${DESTDIR}/lib/udev/load_floppy_module.sh
-        install -m ${SCRIPTMODE} cdsymlink_helper.sh ${DESTDIR}/lib/udev/cdsymlink_helper.sh
+        install -m ${SCRIPTMODE} load_floppy_module.sh ${DESTDIR}/${LIBDIR}/udev/load_floppy_module.sh
+        install -m ${SCRIPTMODE} cdsymlink_helper.sh ${DESTDIR}/${LIBDIR}/udev/cdsymlink_helper.sh
 
 boot:
@@ -42 +43 @@
 
 device_dirs:
-        install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices
-        install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices/pts
-        install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices/shm
-        install -d -m ${DIRMODE} ${DESTDIR}/lib/udev/devices/net
+        install -d -m ${DIRMODE} ${DESTDIR}/${LIBDIR}/udev/devices
+        install -d -m ${DIRMODE} ${DESTDIR}/${LIBDIR}/udev/devices/pts
+        install -d -m ${DIRMODE} ${DESTDIR}/${LIBDIR}/udev/devices/shm
+        install -d -m ${DIRMODE} ${DESTDIR}/${LIBDIR}/udev/devices/net
 
 device_links:
-        ln -snf /proc/self/fd ${DESTDIR}/lib/udev/devices/fd
-        ln -snf /proc/self/fd/0 ${DESTDIR}/lib/udev/devices/stdin
-        ln -snf /proc/self/fd/1 ${DESTDIR}/lib/udev/devices/stdout
-        ln -snf /proc/self/fd/2 ${DESTDIR}/lib/udev/devices/stderr
-        ln -snf /proc/kcore ${DESTDIR}/lib/udev/devices/core
+        ln -snf /proc/self/fd ${DESTDIR}/${LIBDIR}/udev/devices/fd
+        ln -snf /proc/self/fd/0 ${DESTDIR}/${LIBDIR}/udev/devices/stdin
+        ln -snf /proc/self/fd/1 ${DESTDIR}/${LIBDIR}/udev/devices/stdout
+        ln -snf /proc/self/fd/2 ${DESTDIR}/${LIBDIR}/udev/devices/stderr
+        ln -snf /proc/kcore ${DESTDIR}/${LIBDIR}/udev/devices/core
 
 mknod_devices:
         @if [ "$$UID" = "0" ]; then \
-                if ! [ -e ${DESTDIR}/lib/udev/devices/null ]; then \
-                        mknod -m 0666 ${DESTDIR}/lib/udev/devices/null c 1 3 ;\
+                if ! [ -e ${DESTDIR}/${LIBDIR}/udev/devices/null ]; then \
+                        mknod -m 0666 ${DESTDIR}/${LIBDIR}/udev/devices/null c 1 3 ;\
                 fi \
         fi
         @if [ "$$UID" = "0" ]; then \
-                if ! [ -e ${DESTDIR}/lib/udev/devices/console ]; then \
-                        mknod -m 0600 ${DESTDIR}/lib/udev/devices/console c 5 1 ;\
+                if ! [ -e ${DESTDIR}/${LIBDIR}/udev/devices/console ]; then \
+                        mknod -m 0600 ${DESTDIR}/${LIBDIR}/udev/devices/console c 5 1 ;\
                 fi \
         fi
         @if [ "$$UID" != "0" ]; then \
-                if ! [ -e ${DESTDIR}/lib/udev/devices/null ]; then \
+                if ! [ -e ${DESTDIR}/${LIBDIR}/udev/devices/null ]; then \
                         echo "You will need to issue the following command as the root user" ;\
                         echo "" ;\
-                        echo "mknod -m 0666 ${DESTDIR}/lib/udev/devices/null c 1 3" ;\
+                        echo "mknod -m 0666 ${DESTDIR}/${LIBDIR}/udev/devices/null c 1 3" ;\
                 fi \
         fi
         @if [ "$$UID" != "0" ]; then \
-                if ! [ -e ${DESTDIR}/lib/udev/devices/console ]; then \
-                        echo "mknod -m 0600 ${DESTDIR}/lib/udev/devices/console c 5 1" ;\
+                if ! [ -e ${DESTDIR}/${LIBDIR}/udev/devices/console ]; then \
+                        echo "mknod -m 0600 ${DESTDIR}/${LIBDIR}/udev/devices/console c 5 1" ;\
                         echo "" ;\
                 fi \
@@ -89 +90 @@
         @echo "make install-sound               install sound rules"
         @echo "---------------------------------------------------------------------------------------"
+        @echo "add LIBDIR=lib64                 when using /lib64/"
+        @echo "example  make  LIBDIR=lib64 install"
+        @echo "---------------------------------------------------------------------------------------"
 
 install-helper-functions:
-        install -d ${DESTDIR}/lib/udev
+        install -d ${DESTDIR}/${LIBDIR}/udev
         install -d ${DESTDIR}/etc/sysconfig
-        install -m 644 contrib/common/helper.functions ${DESTDIR}/lib/udev/helper.functions
+        install -m 644 contrib/common/helper.functions ${DESTDIR}/${LIBDIR}/udev/helper.functions
         install -m 644 contrib/common/udev_helper ${DESTDIR}/etc/sysconfig/udev_helper
         
 install-device-mapper:
-        install -d ${DESTDIR}/lib/udev
+        install -d ${DESTDIR}/${LIBDIR}/udev
         install -d ${DESTDIR}/etc/rc.d/init.d
         install -m ${RULESMODE} 70-device-mapper.rules ${DESTDIR}/etc/udev/rules.d/70-device-mapper.rules
@@ -110 +114 @@
 
 install-sound:
-        install -d ${DESTDIR}/lib/udev
+        install -d ${DESTDIR}/${LIBDIR}/udev
         install -d ${DESTDIR}/etc/rc.d/init.d
         install -m ${RULESMODE} 55-sound.rules ${DESTDIR}/etc/udev/rules.d/55-sound.rules
 
 install-network-update:
-        install -d ${DESTDIR}/lib/udev
+        install -d ${DESTDIR}/${LIBDIR}/udev
         install -d ${DESTDIR}/etc/rc.d/init.d
-        install -m ${SCRIPTMODE} contrib/network/network_helper.sh ${DESTDIR}/lib/udev/network_helper.sh
+        install -m ${SCRIPTMODE} contrib/network/network_helper.sh ${DESTDIR}/${LIBDIR}/udev/network_helper.sh
         install -m ${INITMODE} contrib/network/network ${DESTDIR}/etc/rc.d/init.d/network