Changeset 5047

Timestamp:

11/26/07 14:54:31 (4 years ago)

Author:

khali

Message:

No warnings about ld configuration for staged installations, as these
make no sense: we have no idea how the target system will be configured.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/Module.mk (modified) (3 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -3 +3 @@
 
 SVN
+  Makefile: No warnings about ld configuration for staged installations
   sensors-detect: Drop PCA9540 detection
 

lm-sensors/branches/lm-sensors-3.0.0/lib/Module.mk

@@ -116 +116 @@
 install-lib: all-lib
         $(MKDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(LIBINCLUDEDIR) $(DESTDIR)$(LIBMAN3DIR) $(DESTDIR)$(LIBMAN5DIR)
-        @if [ ! -e "$(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)" ] ; then \
+        @if [ -z "$(DESTDIR)" -a ! -e "$(LIBDIR)/$(LIBSHSONAME)" ] ; then \
              echo '******************************************************************************' ; \
              echo 'Warning: This is the first installation of the $(LIBSHSONAME)*' ; \
-             echo '         library files in $(DESTDIR)$(LIBDIR)!' ; \
+             echo '         library files in $(LIBDIR)!' ; \
              echo '         You must update the library cache or the userspace tools may fail' ; \
              echo '         or have unpredictable results!' ; \
-                 echo '         Run the following command: /sbin/ldconfig' ; \
+             echo '         Run the following command: /sbin/ldconfig' ; \
              echo '******************************************************************************' ; \
         fi
@@ -129 +129 @@
         $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME)
         $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME)
-        @if [ "$(DESTDIR)$(LIBDIR)" != "/usr/lib" -a "$(DESTDIR)$(LIBDIR)" != "/lib" ] ; then \
+        @if [ -z "$(DESTDIR)" -a "$(LIBDIR)" != "/usr/lib" -a "$(LIBDIR)" != "/lib" ] ; then \
            if [ -e "/usr/lib/$(LIBSHSONAME)" -o -e "/usr/lib/$(LIBSHBASENAME)" ] ; then \
              echo '******************************************************************************' ; \
              echo 'Warning: You have at least one $(LIBSHBASENAME) library file in /usr/lib' ; \
-             echo '         and the new library files are in $(DESTDIR)$(LIBDIR)!' ; \
+             echo '         and the new library files are in $(LIBDIR)!' ; \
              echo '         These old files must be removed or the userspace tools may fail' ; \
              echo '         or have unpredictable results!' ; \
@@ -139 +139 @@
              echo '******************************************************************************' ; \
            fi ; \
-           grep -q '^$(DESTDIR)$(LIBDIR)$$' /etc/ld.so.conf || \
-           grep -q '^$(DESTDIR)$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \
-           grep -q '[[:space:]:,]$(DESTDIR)$(LIBDIR)$$' /etc/ld.so.conf || \
-           grep -q '[[:space:]:,]$(DESTDIR)$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \
+           grep -q '^$(LIBDIR)$$' /etc/ld.so.conf || \
+           grep -q '^$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \
+           grep -q '[[:space:]:,]$(LIBDIR)$$' /etc/ld.so.conf || \
+           grep -q '[[:space:]:,]$(LIBDIR)[[:space:]:,=]' /etc/ld.so.conf || \
                 ( echo '******************************************************************************' ; \
-                  echo 'Warning: Library directory $(DESTDIR)$(LIBDIR) is not in /etc/ld.so.conf!' ; \
+                  echo 'Warning: Library directory $(LIBDIR) is not in /etc/ld.so.conf!' ; \
                   echo '         Add it and run /sbin/ldconfig for the userspace tools to work.' ; \
                   echo '******************************************************************************' ) ; \