[DRBD-cvs] r1946 - branches/drbd-0.7/drbd

[drbd-cvs at lists.linbit.com]

Author: lars
Date: 2005-09-06 15:12:34 +0200 (Tue, 06 Sep 2005)
New Revision: 1946

Modified:
   branches/drbd-0.7/drbd/Makefile
Log:
last Makefile change (test wether PREFIX is empty) effectively disabled depmod
altogether, since we set the default of PREFIX to '/', which is obviously non-empty.
fixed.


Modified: branches/drbd-0.7/drbd/Makefile
===================================================================
--- branches/drbd-0.7/drbd/Makefile	2005-09-06 08:41:13 UTC (rev 1945)
+++ branches/drbd-0.7/drbd/Makefile	2005-09-06 13:12:34 UTC (rev 1946)
@@ -162,11 +162,13 @@
 # install -d $(PREFIX)/var/lib/drbd
 	install -d $(PREFIX)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR)
 	install -m 644 $(MODOBJ) $(PREFIX)/lib/modules/$(KERNELRELEASE)/$(MODSUBDIR)
-    ifeq ($(shell uname -r),$(KERNELRELEASE))
-	[ -n "$(PREFIX)" ] || /sbin/depmod -a || /sbin/depmod -e $(MODOBJ) 2>&1 >/dev/null || true
-    else
-	[ -z "$(PREFIX)" -a -e $(LINUX)/System.map ] && \
+    ifeq ($(PREFIX),/)
+      ifeq ($(shell uname -r),$(KERNELRELEASE))
+	/sbin/depmod -a || /sbin/depmod -e $(MODOBJ) 2>&1 >/dev/null || true
+      else
+	[ -e $(LINUX)/System.map ] && \
 	   /sbin/depmod -F $(LINUX)/System.map -e ./$(MODOBJ) 2>&1 >/dev/null || true
+      endif
     endif
   else
     install: