[DRBD-cvs] scripts by lars; improved make rpm target even further ;...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Sat, 24 Jan 2004 11:43:17 +0100 (CET)


DRBD CVS committal

Author  : lars
Project : drbd
Module  : scripts

Dir     : drbd/scripts


Modified Files:
	Makefile 


Log Message:

improved make rpm target even further ;)


===================================================================
RCS file: /var/lib/cvs/drbd/drbd/scripts/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile	22 Jan 2004 14:32:51 -0000	1.13
+++ Makefile	24 Jan 2004 10:43:16 -0000	1.14
@@ -23,23 +23,23 @@
 include ../Makefile.vars
 
 ifeq ($(DIST),slackware)
-  INITD=$(PREFIX)etc/rc.d/
+  INITD=etc/rc.d/
 endif
 
 ifeq ($(DIST),debian)
-  INITD=$(PREFIX)etc/init.d/
+  INITD=etc/init.d/
 endif
 
 ifeq ($(DIST),redhat)
-  INITD=$(PREFIX)etc/rc.d/init.d/
+  INITD=etc/rc.d/init.d/
 endif
 
 ifeq ($(DIST),suse)
-   INITD=$(PREFIX)etc/init.d/
+   INITD=etc/init.d/
 endif
 
 ifeq ($(DIST),rock)
-  INITD=$(PREFIX)etc/rc.d/init.d/
+  INITD=etc/rc.d/init.d/
 endif
 
 
@@ -50,13 +50,13 @@
 	$(if $(DIST),,\
 	  $(error Can not guess distribution, please fix Makefile.vars))
 	mkdir -p $(PREFIX)etc/ha.d/resource.d
-	install -D -m 755 drbd $(INITD)/drbd
+	install -D -m 755 drbd $(PREFIX)$(INITD)/drbd
 	@ if [ ! -e $(PREFIX)etc/drbd.conf ]; then \
 		install -D -m 644 drbd.conf $(PREFIX)etc/drbd.conf; \
 	fi
-	ln -f $(INITD)drbd $(PREFIX)etc/ha.d/resource.d/datadisk
+	ln -sf ../../../$(INITD)drbd $(PREFIX)etc/ha.d/resource.d/datadisk
 ifeq ($(DIST),suse)
-	ln -sf $(INITD)drbd $(PREFIX)sbin/rcdrbd
+	ln -sf ../$(INITD)drbd $(PREFIX)sbin/rcdrbd
 endif
 	@ echo
 	@ echo "Don't forget to run update-rc.d or chkconfig"
@@ -66,6 +66,6 @@
 	rm -f datadisk
 
 uninstall:
-	rm $(INITD)drbd
+	rm $(PREFIX)$(INITD)drbd
 	rm $(PREFIX)etc/ha.d/resource.d/datadisk
 	test "$(DIST)" = suse && rm $(PREFIX)sbin/rcdrbd