All of lore.kernel.org
 help / color / mirror / Atom feed
* multipath-tools/path_priority pp_alua/Makefile ...
@ 2007-06-15 19:05 bmarzins
  0 siblings, 0 replies; 3+ messages in thread
From: bmarzins @ 2007-06-15 19:05 UTC (permalink / raw)
  To: dm-cvs, dm-devel

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins@sourceware.org	2007-06-15 19:05:22

Modified files:
	path_priority/pp_alua: Makefile 
	path_priority/pp_balance_units: Makefile 
	path_priority/pp_emc: Makefile 
	path_priority/pp_hds_modular: Makefile 
	path_priority/pp_netapp: Makefile 
	path_priority/pp_tpc: Makefile 

Log message:
	Applied Bryn's patch for 243483 (multipath-tools-0.4.7.rhel5.2-ppstatic.patch)
	multipath now builds static versions of the path_priority callouts

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_alua/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.5&r2=1.5.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_balance_units/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2&r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_emc/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.4&r2=1.4.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_hds_modular/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2&r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_netapp/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2&r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_tpc/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.1&r2=1.1.2.1

--- multipath-tools/path_priority/pp_alua/Makefile	2006/06/06 18:32:44	1.5
+++ multipath-tools/path_priority/pp_alua/Makefile	2007/06/15 19:05:21	1.5.2.1
@@ -31,11 +31,13 @@
 
 glibc:	$(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(BUILD) $(EXEC).8
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 	$(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
 	$(INSTALL) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/$(EXEC).8
 
--- multipath-tools/path_priority/pp_balance_units/Makefile	2006/06/06 18:32:44	1.2
+++ multipath-tools/path_priority/pp_balance_units/Makefile	2007/06/15 19:05:21	1.2.2.1
@@ -35,6 +35,7 @@
 
 install:
 	install -d $(DESTDIR)$(bindir)
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
 
 uninstall:
--- multipath-tools/path_priority/pp_emc/Makefile	2006/06/06 18:32:44	1.4
+++ multipath-tools/path_priority/pp_emc/Makefile	2007/06/15 19:05:21	1.4.2.1
@@ -9,11 +9,13 @@
 
 glibc:	$(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(EXEC)
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
--- multipath-tools/path_priority/pp_hds_modular/Makefile	2006/06/06 18:32:44	1.2
+++ multipath-tools/path_priority/pp_hds_modular/Makefile	2007/06/15 19:05:21	1.2.2.1
@@ -9,11 +9,13 @@
 
 glibc:	$(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(EXEC)
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
--- multipath-tools/path_priority/pp_netapp/Makefile	2006/06/06 18:32:44	1.2
+++ multipath-tools/path_priority/pp_netapp/Makefile	2007/06/15 19:05:22	1.2.2.1
@@ -9,11 +9,13 @@
 
 glibc:	$(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(EXEC)
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
--- multipath-tools/path_priority/pp_tpc/Makefile	2006/06/06 18:46:38	1.1
+++ multipath-tools/path_priority/pp_tpc/Makefile	2007/06/15 19:05:22	1.1.2.1
@@ -9,11 +9,13 @@
 
 glibc:	$(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(EXEC)
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:

^ permalink raw reply	[flat|nested] 3+ messages in thread
* multipath-tools/path_priority pp_alua/Makefile ...
@ 2007-06-15 21:03 bmarzins
  0 siblings, 0 replies; 3+ messages in thread
From: bmarzins @ 2007-06-15 21:03 UTC (permalink / raw)
  To: dm-cvs, dm-devel

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins@sourceware.org	2007-06-15 21:03:14

Modified files:
	path_priority/pp_alua: Makefile 
	path_priority/pp_balance_units: Makefile 
	path_priority/pp_emc: Makefile 
	path_priority/pp_hds_modular: Makefile 
	path_priority/pp_netapp: Makefile 
	path_priority/pp_rdac: Makefile 
	path_priority/pp_tpc: Makefile 

Log message:
	Did a some more makefile cleanup for bz # 243483

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_alua/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.5.2.1&r2=1.5.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_balance_units/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.2.1&r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_emc/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.4.2.1&r2=1.4.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_hds_modular/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.2.1&r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_netapp/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.2.1&r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_rdac/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.1.2.1&r2=1.1.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_tpc/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.1.2.1&r2=1.1.2.2

--- multipath-tools/path_priority/pp_alua/Makefile	2007/06/15 19:05:21	1.5.2.1
+++ multipath-tools/path_priority/pp_alua/Makefile	2007/06/15 21:03:13	1.5.2.2
@@ -43,10 +43,11 @@
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
 	rm $(DESTDIR)$(mandir)/$(EXEC).8
 
 clean:	
-	rm -f *.o *.gz $(EXEC)
+	rm -f *.o *.gz $(EXEC) $(EXEC).static
 
 main.o:	main.c rtpg.h spc3.h
 
--- multipath-tools/path_priority/pp_balance_units/Makefile	2007/06/15 19:05:21	1.2.2.1
+++ multipath-tools/path_priority/pp_balance_units/Makefile	2007/06/15 21:03:14	1.2.2.2
@@ -26,6 +26,7 @@
 
 glibc: prepare $(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc: prepare $(OBJS)
 	$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
@@ -40,6 +41,7 @@
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
 
 clean:
-	rm -f core *.o $(EXEC) *.gz
+	rm -f core *.o $(EXEC) $(EXEC).static *.gz
--- multipath-tools/path_priority/pp_emc/Makefile	2007/06/15 19:05:21	1.4.2.1
+++ multipath-tools/path_priority/pp_emc/Makefile	2007/06/15 21:03:14	1.4.2.2
@@ -20,8 +20,9 @@
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC)
+	rm -f *.o $(EXEC) $(EXEC).static
 
 %.o:	%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
--- multipath-tools/path_priority/pp_hds_modular/Makefile	2007/06/15 19:05:21	1.2.2.1
+++ multipath-tools/path_priority/pp_hds_modular/Makefile	2007/06/15 21:03:14	1.2.2.2
@@ -20,5 +20,6 @@
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC)
+	rm -f *.o $(EXEC) $(EXEC).static
--- multipath-tools/path_priority/pp_netapp/Makefile	2007/06/15 19:05:22	1.2.2.1
+++ multipath-tools/path_priority/pp_netapp/Makefile	2007/06/15 21:03:14	1.2.2.2
@@ -20,5 +20,6 @@
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC)
+	rm -f *.o $(EXEC) $(EXEC).static
--- multipath-tools/path_priority/pp_rdac/Attic/Makefile	2007/06/01 00:26:42	1.1.2.1
+++ multipath-tools/path_priority/pp_rdac/Attic/Makefile	2007/06/15 21:03:14	1.1.2.2
@@ -9,17 +9,21 @@
 
 glibc:	$(OBJS)
 	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
+	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(EXEC)
-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
+
 clean:
-	rm -f *.o $(EXEC)
+	rm -f *.o $(EXEC) $(EXEC).static
 
 %.o:	%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
--- multipath-tools/path_priority/pp_tpc/Makefile	2007/06/15 19:05:22	1.1.2.1
+++ multipath-tools/path_priority/pp_tpc/Makefile	2007/06/15 21:03:14	1.1.2.2
@@ -20,5 +20,6 @@
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
+	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC)
+	rm -f *.o $(EXEC) $(EXEC).static

^ permalink raw reply	[flat|nested] 3+ messages in thread
* multipath-tools/path_priority pp_alua/Makefile ...
@ 2008-02-07 22:18 bmarzins
  0 siblings, 0 replies; 3+ messages in thread
From: bmarzins @ 2008-02-07 22:18 UTC (permalink / raw)
  To: dm-cvs, dm-devel

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins@sourceware.org	2008-02-07 22:18:47

Modified files:
	path_priority/pp_alua: Makefile 
	path_priority/pp_balance_units: Makefile 
	path_priority/pp_emc: Makefile 
	path_priority/pp_hds_modular: Makefile 
	path_priority/pp_netapp: Makefile 
	path_priority/pp_rdac: Makefile 
	path_priority/pp_tpc: Makefile 

Log message:
	Fix for bz 428338.  Now all of multipath's non-static callouts are just links
	to the static ones. This fixes lockups that were happening when access to the
	root filesystem was lost for devices that needed priority callouts.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_alua/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.5.2.2&r2=1.5.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_balance_units/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.2.2&r2=1.2.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_emc/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.4.2.2&r2=1.4.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_hds_modular/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.2.2&r2=1.2.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_netapp/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.2.5&r2=1.2.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_rdac/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.1.2.2&r2=1.1.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/path_priority/pp_tpc/Makefile.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.1.2.2&r2=1.1.2.3

--- multipath-tools/path_priority/pp_alua/Makefile	2007/06/15 21:03:13	1.5.2.2
+++ multipath-tools/path_priority/pp_alua/Makefile	2008/02/07 22:18:46	1.5.2.3
@@ -30,15 +30,14 @@
 all: $(BUILD)
 
 glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
 install: $(BUILD) $(EXEC).8
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
-	$(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+	$(INSTALL) -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
 	$(INSTALL) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/$(EXEC).8
 
 uninstall:
@@ -47,7 +46,7 @@
 	rm $(DESTDIR)$(mandir)/$(EXEC).8
 
 clean:	
-	rm -f *.o *.gz $(EXEC) $(EXEC).static
+	rm -f *.o *.gz $(EXEC).static
 
 main.o:	main.c rtpg.h spc3.h
 
--- multipath-tools/path_priority/pp_balance_units/Makefile	2007/06/15 21:03:14	1.2.2.2
+++ multipath-tools/path_priority/pp_balance_units/Makefile	2008/02/07 22:18:46	1.2.2.3
@@ -25,7 +25,6 @@
 	rm -f core *.o *.gz
 
 glibc: prepare $(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc: prepare $(OBJS)
@@ -36,12 +35,12 @@
 
 install:
 	install -d $(DESTDIR)$(bindir)
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
-	install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
 	rm $(DESTDIR)$(bindir)/$(EXEC).static
 
 clean:
-	rm -f core *.o $(EXEC) $(EXEC).static *.gz
+	rm -f core *.o $(EXEC).static *.gz
--- multipath-tools/path_priority/pp_emc/Makefile	2007/06/15 21:03:14	1.4.2.2
+++ multipath-tools/path_priority/pp_emc/Makefile	2008/02/07 22:18:46	1.4.2.3
@@ -8,21 +8,21 @@
 all: $(BUILD)
 
 glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
-install: $(EXEC)
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
-	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+install: $(BUILD)
+	install -d $(DESTDIR)$(bindir)
+	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
 	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC) $(EXEC).static
+	rm -f *.o $(EXEC).static
 
 %.o:	%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
--- multipath-tools/path_priority/pp_hds_modular/Makefile	2007/06/15 21:03:14	1.2.2.2
+++ multipath-tools/path_priority/pp_hds_modular/Makefile	2008/02/07 22:18:46	1.2.2.3
@@ -8,18 +8,18 @@
 all: $(BUILD)
 
 glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
-install: $(EXEC)
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
-	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+install: $(BUILD)
+	install -d $(DESTDIR)$(bindir)
+	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
 	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC) $(EXEC).static
+	rm -f *.o $(EXEC).static
--- multipath-tools/path_priority/pp_netapp/Makefile	2007/12/03 23:11:51	1.2.2.5
+++ multipath-tools/path_priority/pp_netapp/Makefile	2008/02/07 22:18:46	1.2.2.6
@@ -8,16 +8,16 @@
 all: $(BUILD)
 
 glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
-install: $(EXEC)
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
-	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
-	ln -sf $(EXEC) $(DESTDIR)$(bindir)/mpath_prio_netapp
+install: $(BUILD)
+	install -d $(DESTDIR)$(bindir)
+	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/mpath_prio_netapp
 	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/mpath_prio_netapp.static
 
 uninstall:
@@ -27,4 +27,4 @@
 	rm $(DESTDIR)$(bindir)/mpath_prio_netapp.static
 
 clean:	
-	rm -f *.o $(EXEC) $(EXEC).static
+	rm -f *.o $(EXEC).static
--- multipath-tools/path_priority/pp_rdac/Attic/Makefile	2007/06/15 21:03:14	1.1.2.2
+++ multipath-tools/path_priority/pp_rdac/Attic/Makefile	2008/02/07 22:18:47	1.1.2.3
@@ -8,22 +8,22 @@
 all: $(BUILD)
 
 glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
-install: $(EXEC)
-	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+install: $(BUILD)
+	install -d $(DESTDIR)$(bindir)
+	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
 	rm $(DESTDIR)$(bindir)/$(EXEC).static
 
 clean:
-	rm -f *.o $(EXEC) $(EXEC).static
+	rm -f *.o $(EXEC).static
 
 %.o:	%.c
 	$(CC) $(CFLAGS) -c -o $@ $<
--- multipath-tools/path_priority/pp_tpc/Makefile	2007/06/15 21:03:14	1.1.2.2
+++ multipath-tools/path_priority/pp_tpc/Makefile	2008/02/07 22:18:47	1.1.2.3
@@ -8,18 +8,18 @@
 all: $(BUILD)
 
 glibc:	$(OBJS)
-	$(CC) -o $(EXEC) $(OBJS) $(LDFLAGS)
 	$(CC) -static -o $(EXEC).static $(OBJS) $(LDFLAGS)
 
 klibc:	$(OBJS)
 	$(CC) -static -o $(EXEC) $(OBJS)
 
-install: $(EXEC)
-	[ -f $(EXEC).static ] && install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
-	install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+install: $(BUILD)
+	install -d $(DESTDIR)$(bindir)
+	install -m 755 $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC).static
+	ln -sf $(EXEC).static $(DESTDIR)$(bindir)/$(EXEC)
 
 uninstall:
 	rm $(DESTDIR)$(bindir)/$(EXEC)
 	rm $(DESTDIR)$(bindir)/$(EXEC).static
 clean:	
-	rm -f *.o $(EXEC) $(EXEC).static
+	rm -f *.o $(EXEC).static

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-02-07 22:18 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-15 19:05 multipath-tools/path_priority pp_alua/Makefile bmarzins
  -- strict thread matches above, loose matches on Subject: below --
2007-06-15 21:03 bmarzins
2008-02-07 22:18 bmarzins

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.