306 -install_sh_DATA = $(install_sh) -c -m 644 |
306 -install_sh_DATA = $(install_sh) -c -m 644 |
307 +install_sh_DATA = $(install_sh) -c -m 744 |
307 +install_sh_DATA = $(install_sh) -c -m 744 |
308 install_sh_PROGRAM = $(install_sh) -c |
308 install_sh_PROGRAM = $(install_sh) -c |
309 install_sh_SCRIPT = $(install_sh) -c |
309 install_sh_SCRIPT = $(install_sh) -c |
310 INSTALL_HEADER = $(INSTALL_DATA) |
310 INSTALL_HEADER = $(INSTALL_DATA) |
311 @@ -96,7 +96,7 @@ |
311 @@ -244,7 +244,7 @@ |
312 am__base_list = \ |
|
313 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
314 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
315 -am__installdirs = "$(DESTDIR)$(bindir)" |
|
316 +am__installdirs = "$(DESTDIR)$(sbindir)" |
|
317 SCRIPTS = $(bin_SCRIPTS) |
|
318 SOURCES = |
|
319 DIST_SOURCES = |
|
320 @@ -224,8 +224,8 @@ |
|
321 $(am__aclocal_m4_deps): |
|
322 install-binSCRIPTS: $(bin_SCRIPTS) |
|
323 @$(NORMAL_INSTALL) |
|
324 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
325 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
|
326 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
327 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ |
|
328 for p in $$list; do \ |
|
329 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
330 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
|
331 @@ -243,19 +243,19 @@ |
|
332 while read type dir files; do \ |
|
333 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
312 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
334 test -z "$$files" || { \ |
313 test -z "$$files" || { \ |
335 - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
314 echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
336 - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
315 - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
337 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
316 + $(INSTALL_SCRIPT) -m 755 $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
338 + $(INSTALL_SCRIPT) -m 755 $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
339 } \ |
317 } \ |
340 ; done |
318 ; done |
341 |
319 |
342 uninstall-binSCRIPTS: |
|
343 @$(NORMAL_UNINSTALL) |
|
344 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ |
|
345 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ |
|
346 files=`for p in $$list; do echo "$$p"; done | \ |
|
347 sed -e 's,.*/,,;$(transform)'`; \ |
|
348 test -n "$$list" || exit 0; \ |
|
349 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
350 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
351 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
352 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
353 tags: TAGS |
|
354 TAGS: |
|
355 |
|
356 @@ -297,7 +297,7 @@ |
|
357 check: check-am |
|
358 all-am: Makefile $(SCRIPTS) |
|
359 installdirs: |
|
360 - for dir in "$(DESTDIR)$(bindir)"; do \ |
|
361 + for dir in "$(DESTDIR)$(sbindir)"; do \ |
|
362 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
363 done |
|
364 install: install-am |
|
365 @@ -426,6 +426,7 @@ |
320 @@ -426,6 +426,7 @@ |
366 sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \ |
321 sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \ |
367 -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \ |
322 -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \ |
368 -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \ |
323 -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \ |
369 + -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \ |
324 + -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \ |
492 -install_sh_DATA = $(install_sh) -c -m 644 |
447 -install_sh_DATA = $(install_sh) -c -m 644 |
493 +install_sh_DATA = $(install_sh) -c -m 744 |
448 +install_sh_DATA = $(install_sh) -c -m 744 |
494 install_sh_PROGRAM = $(install_sh) -c |
449 install_sh_PROGRAM = $(install_sh) -c |
495 install_sh_SCRIPT = $(install_sh) -c |
450 install_sh_SCRIPT = $(install_sh) -c |
496 INSTALL_HEADER = $(INSTALL_DATA) |
451 INSTALL_HEADER = $(INSTALL_DATA) |
497 @@ -105,7 +105,7 @@ |
|
498 am__base_list = \ |
|
499 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
500 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
501 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
|
502 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \ |
|
503 "$(DESTDIR)$(pkgincludedir)" |
|
504 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
505 libibsysapi_la_DEPENDENCIES = |
|
506 @@ -369,8 +369,8 @@ |
|
507 $(libibsysapi_la_LINK) -rpath $(libdir) $(libibsysapi_la_OBJECTS) $(libibsysapi_la_LIBADD) $(LIBS) |
|
508 install-binPROGRAMS: $(bin_PROGRAMS) |
|
509 @$(NORMAL_INSTALL) |
|
510 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
511 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
512 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
513 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
514 for p in $$list; do echo "$$p $$p"; done | \ |
|
515 sed 's/$(EXEEXT)$$//' | \ |
|
516 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
517 @@ -387,20 +387,20 @@ |
|
518 while read type dir files; do \ |
|
519 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
520 test -z "$$files" || { \ |
|
521 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
522 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
523 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
524 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
525 } \ |
|
526 ; done |
|
527 |
|
528 uninstall-binPROGRAMS: |
|
529 @$(NORMAL_UNINSTALL) |
|
530 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
531 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
532 files=`for p in $$list; do echo "$$p"; done | \ |
|
533 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
534 -e 's/$$/$(EXEEXT)/' `; \ |
|
535 test -n "$$list" || exit 0; \ |
|
536 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
537 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
538 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
539 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
540 |
|
541 clean-binPROGRAMS: |
|
542 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
543 @@ -573,7 +573,7 @@ |
|
544 install-binPROGRAMS: install-libLTLIBRARIES |
|
545 |
|
546 installdirs: |
|
547 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
548 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
549 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
550 done |
|
551 install: install-am |
|
552 diff -r -u /tmp/ibutils-1.5.7/ibdm/Makefile.in ibutils-1.5.7/ibdm/Makefile.in |
452 diff -r -u /tmp/ibutils-1.5.7/ibdm/Makefile.in ibutils-1.5.7/ibdm/Makefile.in |
553 --- /tmp/ibutils-1.5.7/ibdm/Makefile.in Tue Mar 8 03:09:42 2011 |
453 --- /tmp/ibutils-1.5.7/ibdm/Makefile.in Tue Mar 8 03:09:42 2011 |
554 +++ ibutils-1.5.7/ibdm/Makefile.in Thu Feb 24 16:51:16 2011 |
454 +++ ibutils-1.5.7/ibdm/Makefile.in Thu Feb 24 16:51:16 2011 |
555 @@ -54,7 +54,7 @@ |
455 @@ -54,7 +54,7 @@ |
556 pkglibdir = $(libdir)/@PACKAGE@ |
456 pkglibdir = $(libdir)/@PACKAGE@ |
559 -install_sh_DATA = $(install_sh) -c -m 644 |
459 -install_sh_DATA = $(install_sh) -c -m 644 |
560 +install_sh_DATA = $(install_sh) -c -m 744 |
460 +install_sh_DATA = $(install_sh) -c -m 744 |
561 install_sh_PROGRAM = $(install_sh) -c |
461 install_sh_PROGRAM = $(install_sh) -c |
562 install_sh_SCRIPT = $(install_sh) -c |
462 install_sh_SCRIPT = $(install_sh) -c |
563 INSTALL_HEADER = $(INSTALL_DATA) |
463 INSTALL_HEADER = $(INSTALL_DATA) |
564 diff -r -u /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.am ibutils-1.5.7/ibdm/scripts/Makefile.am |
|
565 --- /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.am Mon Nov 1 16:03:44 2010 |
|
566 +++ ibutils-1.5.7/ibdm/scripts/Makefile.am Thu Feb 24 16:51:17 2011 |
|
567 @@ -37,5 +37,5 @@ |
|
568 EXTRA_DIST = $(pkgdata_DATA) |
|
569 |
|
570 install-data-am: |
|
571 - for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(bindir)/; done |
|
572 + for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(sbindir)/; done |
|
573 |
|
574 diff -r -u /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.in ibutils-1.5.7/ibdm/scripts/Makefile.in |
464 diff -r -u /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.in ibutils-1.5.7/ibdm/scripts/Makefile.in |
575 --- /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.in Tue Mar 8 03:09:41 2011 |
465 --- /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.in Tue Mar 8 03:09:41 2011 |
576 +++ ibutils-1.5.7/ibdm/scripts/Makefile.in Thu Feb 24 16:51:17 2011 |
466 +++ ibutils-1.5.7/ibdm/scripts/Makefile.in Thu Feb 24 16:51:17 2011 |
577 @@ -53,7 +53,7 @@ |
467 @@ -53,7 +53,7 @@ |
578 pkglibdir = $(libdir)/@PACKAGE@ |
468 pkglibdir = $(libdir)/@PACKAGE@ |
581 -install_sh_DATA = $(install_sh) -c -m 644 |
471 -install_sh_DATA = $(install_sh) -c -m 644 |
582 +install_sh_DATA = $(install_sh) -c -m 744 |
472 +install_sh_DATA = $(install_sh) -c -m 744 |
583 install_sh_PROGRAM = $(install_sh) -c |
473 install_sh_PROGRAM = $(install_sh) -c |
584 install_sh_SCRIPT = $(install_sh) -c |
474 install_sh_SCRIPT = $(install_sh) -c |
585 INSTALL_HEADER = $(INSTALL_DATA) |
475 INSTALL_HEADER = $(INSTALL_DATA) |
586 @@ -447,7 +447,7 @@ |
|
587 |
|
588 |
|
589 install-data-am: |
|
590 - for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(bindir)/; done |
|
591 + for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(sbindir)/; done |
|
592 |
|
593 # Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
594 # Otherwise a system limit (for SysV at least) may be exceeded. |
|
595 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.cpp ibutils-1.5.7/ibdm/ibdm/Fabric.cpp |
476 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.cpp ibutils-1.5.7/ibdm/ibdm/Fabric.cpp |
596 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.cpp Thu Oct 7 07:29:56 2010 |
477 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.cpp Thu Oct 7 07:29:56 2010 |
597 +++ ibutils-1.5.7/ibdm/ibdm/Fabric.cpp Mon Sep 19 12:03:07 2011 |
478 +++ ibutils-1.5.7/ibdm/ibdm/Fabric.cpp Mon Sep 19 12:03:07 2011 |
598 @@ -1954,6 +1954,7 @@ |
479 @@ -1954,6 +1954,7 @@ |
599 }*/ |
480 }*/ |
646 -install_sh_DATA = $(install_sh) -c -m 644 |
527 -install_sh_DATA = $(install_sh) -c -m 644 |
647 +install_sh_DATA = $(install_sh) -c -m 744 |
528 +install_sh_DATA = $(install_sh) -c -m 744 |
648 install_sh_PROGRAM = $(install_sh) -c |
529 install_sh_PROGRAM = $(install_sh) -c |
649 install_sh_SCRIPT = $(install_sh) -c |
530 install_sh_SCRIPT = $(install_sh) -c |
650 INSTALL_HEADER = $(INSTALL_DATA) |
531 INSTALL_HEADER = $(INSTALL_DATA) |
651 @@ -102,7 +102,7 @@ |
|
652 am__base_list = \ |
|
653 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
654 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
655 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
|
656 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \ |
|
657 "$(DESTDIR)$(pkgincludedir)" |
|
658 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
659 am__DEPENDENCIES_1 = |
|
660 @@ -316,7 +316,7 @@ |
532 @@ -316,7 +316,7 @@ |
661 AM_CFLAGS = $(DBG) $(IBNL_PATH) $(TCL_CFLAGS) |
533 AM_CFLAGS = $(DBG) $(IBNL_PATH) $(TCL_CFLAGS) |
662 lib_LTLIBRARIES = libibdmcom.la libibdm.la |
534 lib_LTLIBRARIES = libibdmcom.la libibdm.la |
663 libibdmcom_la_SOURCES = $(common_SOURCES) |
535 libibdmcom_la_SOURCES = $(common_SOURCES) |
664 -libibdmcom_la_LIBADD = |
536 -libibdmcom_la_LIBADD = |
665 +libibdmcom_la_LIBADD = $(TCL_LIBS) |
537 +libibdmcom_la_LIBADD = $(TCL_LIBS) |
666 libibdmcom_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET) |
538 libibdmcom_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET) |
667 libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES) |
539 libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES) |
668 libibdm_la_LIBADD = $(TCL_LIBS) |
540 libibdm_la_LIBADD = $(TCL_LIBS) |
669 @@ -402,8 +402,8 @@ |
|
670 $(libibdmcom_la_LINK) -rpath $(libdir) $(libibdmcom_la_OBJECTS) $(libibdmcom_la_LIBADD) $(LIBS) |
|
671 install-binPROGRAMS: $(bin_PROGRAMS) |
|
672 @$(NORMAL_INSTALL) |
|
673 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
674 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
675 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
676 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
677 for p in $$list; do echo "$$p $$p"; done | \ |
|
678 sed 's/$(EXEEXT)$$//' | \ |
|
679 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
680 @@ -420,20 +420,20 @@ |
|
681 while read type dir files; do \ |
|
682 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
683 test -z "$$files" || { \ |
|
684 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
685 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
686 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
687 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
688 } \ |
|
689 ; done |
|
690 |
|
691 uninstall-binPROGRAMS: |
|
692 @$(NORMAL_UNINSTALL) |
|
693 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
694 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
695 files=`for p in $$list; do echo "$$p"; done | \ |
|
696 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
697 -e 's/$$/$(EXEEXT)/' `; \ |
|
698 test -n "$$list" || exit 0; \ |
|
699 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
700 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
701 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
702 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
703 |
|
704 clean-binPROGRAMS: |
|
705 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
706 @@ -628,7 +628,7 @@ |
|
707 install-binPROGRAMS: install-libLTLIBRARIES |
|
708 |
|
709 installdirs: |
|
710 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
711 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
712 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
713 done |
|
714 install: install-am |
|
715 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp |
541 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp |
716 --- /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Oct 7 07:28:58 2010 |
542 --- /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Oct 7 07:28:58 2010 |
717 +++ ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Feb 24 16:51:17 2011 |
543 +++ ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Feb 24 16:51:17 2011 |
718 @@ -23,6 +23,9 @@ |
544 @@ -23,6 +23,9 @@ |
719 #include INCLUDE_TCL |
545 #include INCLUDE_TCL |
859 -install_sh_DATA = $(install_sh) -c -m 644 |
685 -install_sh_DATA = $(install_sh) -c -m 644 |
860 +install_sh_DATA = $(install_sh) -c -m 744 |
686 +install_sh_DATA = $(install_sh) -c -m 744 |
861 install_sh_PROGRAM = $(install_sh) -c |
687 install_sh_PROGRAM = $(install_sh) -c |
862 install_sh_SCRIPT = $(install_sh) -c |
688 install_sh_SCRIPT = $(install_sh) -c |
863 INSTALL_HEADER = $(INSTALL_DATA) |
689 INSTALL_HEADER = $(INSTALL_DATA) |
864 @@ -113,7 +113,7 @@ |
|
865 am__base_list = \ |
|
866 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
867 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
868 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" |
|
869 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" |
|
870 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
871 libibis_la_LIBADD = |
|
872 am_libibis_la_OBJECTS = ibis_wrap.lo ibbbm.lo ibcr.lo ibis.lo \ |
|
873 @@ -420,8 +420,8 @@ |
|
874 $(libibis_la_LINK) -rpath $(libdir) $(libibis_la_OBJECTS) $(libibis_la_LIBADD) $(LIBS) |
|
875 install-binPROGRAMS: $(bin_PROGRAMS) |
|
876 @$(NORMAL_INSTALL) |
|
877 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
878 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
879 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
880 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
881 for p in $$list; do echo "$$p $$p"; done | \ |
|
882 sed 's/$(EXEEXT)$$//' | \ |
|
883 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
884 @@ -438,20 +438,20 @@ |
|
885 while read type dir files; do \ |
|
886 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
887 test -z "$$files" || { \ |
|
888 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
889 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
890 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
891 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
892 } \ |
|
893 ; done |
|
894 |
|
895 uninstall-binPROGRAMS: |
|
896 @$(NORMAL_UNINSTALL) |
|
897 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
898 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
899 files=`for p in $$list; do echo "$$p"; done | \ |
|
900 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
901 -e 's/$$/$(EXEEXT)/' `; \ |
|
902 test -n "$$list" || exit 0; \ |
|
903 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
904 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
905 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
906 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
907 |
|
908 clean-binPROGRAMS: |
|
909 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
910 @@ -754,7 +754,7 @@ |
|
911 install-binPROGRAMS: install-libLTLIBRARIES |
|
912 |
|
913 installdirs: |
|
914 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \ |
|
915 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"; do \ |
|
916 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
917 done |
|
918 install: install-am |
|
919 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h ibutils-1.5.7/ibis/src/ibbbm_base.h |
690 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h ibutils-1.5.7/ibis/src/ibbbm_base.h |
920 --- /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h Wed Feb 24 02:09:25 2010 |
691 --- /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h Wed Feb 24 02:09:25 2010 |
921 +++ ibutils-1.5.7/ibis/src/ibbbm_base.h Thu Feb 24 16:51:18 2011 |
692 +++ ibutils-1.5.7/ibis/src/ibbbm_base.h Thu Feb 24 16:51:18 2011 |
922 @@ -30,11 +30,14 @@ |
693 @@ -30,11 +30,14 @@ |
923 * SOFTWARE. |
694 * SOFTWARE. |
994 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned)); |
765 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned)); |
995 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned)); |
766 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned)); |
996 |
767 |
997 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */ |
768 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */ |
998 |
769 |
|
770 @@ -35180,7 +35180,18 @@ |
|
771 } |
|
772 return TCL_OK; |
|
773 } |
|
774 +#ifdef __sparc |
|
775 +#define _ibsm_node_info_sys_guid_set(_swigobj,_swigval) _ibsm_node_info_sys_guid_set_64(_swigobj, _swigval) |
|
776 +static inline ib_net64_t * |
|
777 +_ibsm_node_info_sys_guid_set_64(smNodeInfo *_swigobj, ib_net64_t *swigval) |
|
778 +{ |
|
779 + *(ib_net32_t *)&(_swigobj->sys_guid) = *((ib_net32_t *)swigval); |
|
780 + *((ib_net32_t *)&(_swigobj->sys_guid) + 1) = *((ib_net32_t *)swigval +1); |
|
781 + return ((ib_net64_t *)swigval); |
|
782 +} |
|
783 +#else |
|
784 #define _ibsm_node_info_sys_guid_set(_swigobj,_swigval) (_swigobj->sys_guid = *(_swigval),_swigval) |
|
785 +#endif |
|
786 static int _wrap_smNodeInfo_sys_guid_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
787 |
|
788 ib_net64_t * _result; |
|
789 @@ -35238,7 +35249,17 @@ |
|
790 } |
|
791 return TCL_OK; |
|
792 } |
|
793 +#ifdef __sparc |
|
794 +#define _ibsm_node_info_sys_guid_get(_swigobj) _ibsm_node_info_sys_guid_get_64(_swigobj) |
|
795 +static inline ib_net64_t * _ibsm_node_info_sys_guid_get_64(smNodeInfo *_swigobj){ |
|
796 + static uint32_t val[2]; |
|
797 + val[0] = *(ib_net32_t *)&(_swigobj->sys_guid); |
|
798 + val[1] = *((ib_net32_t *)&(_swigobj->sys_guid) + 1); |
|
799 + return ((ib_net64_t *)&val); |
|
800 +} |
|
801 +#else |
|
802 #define _ibsm_node_info_sys_guid_get(_swigobj) (&_swigobj->sys_guid) |
|
803 +#endif |
|
804 static int _wrap_smNodeInfo_sys_guid_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
805 |
|
806 ib_net64_t * _result; |
|
807 @@ -35290,7 +35311,18 @@ |
|
808 } |
|
809 return TCL_OK; |
|
810 } |
|
811 +#ifdef __sparc |
|
812 +#define _ibsm_node_info_node_guid_set(_swigobj,_swigval) _ibsm_node_info_node_guid_set_64(_swigobj, _swigval) |
|
813 +static inline ib_net64_t * |
|
814 +_ibsm_node_info_node_guid_set_64(smNodeInfo *_swigobj, ib_net64_t *swigval) |
|
815 +{ |
|
816 + *(ib_net32_t *)&(_swigobj->node_guid) = *((ib_net32_t *)swigval); |
|
817 + *((ib_net32_t *)&(_swigobj->node_guid) + 1) = *((ib_net32_t *)swigval +1); |
|
818 + return ((ib_net64_t *)swigval); |
|
819 +} |
|
820 +#else |
|
821 #define _ibsm_node_info_node_guid_set(_swigobj,_swigval) (_swigobj->node_guid = *(_swigval),_swigval) |
|
822 +#endif |
|
823 static int _wrap_smNodeInfo_node_guid_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
824 |
|
825 ib_net64_t * _result; |
|
826 @@ -35348,7 +35380,17 @@ |
|
827 } |
|
828 return TCL_OK; |
|
829 } |
|
830 +#ifdef __sparc |
|
831 +#define _ibsm_node_info_node_guid_get(_swigobj) _ibsm_node_info_node_guid_get_64(_swigobj) |
|
832 +static inline ib_net64_t * _ibsm_node_info_node_guid_get_64(smNodeInfo *_swigobj){ |
|
833 + static uint32_t val[2]; |
|
834 + val[0] = *(ib_net32_t *)&(_swigobj->node_guid); |
|
835 + val[1] = *((ib_net32_t *)&(_swigobj->node_guid) + 1); |
|
836 + return ((ib_net64_t *)&val); |
|
837 +} |
|
838 +#else |
|
839 #define _ibsm_node_info_node_guid_get(_swigobj) (&_swigobj->node_guid) |
|
840 +#endif |
|
841 static int _wrap_smNodeInfo_node_guid_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
842 |
|
843 ib_net64_t * _result; |
|
844 @@ -35400,7 +35442,18 @@ |
|
845 } |
|
846 return TCL_OK; |
|
847 } |
|
848 +#ifdef __sparc |
|
849 +#define _ibsm_node_info_port_guid_set(_swigobj,_swigval) _ibsm_node_info_port_guid_set_64(_swigobj, _swigval) |
|
850 +static inline ib_net64_t * |
|
851 +_ibsm_node_info_port_guid_set_64(smNodeInfo *_swigobj, ib_net64_t *swigval) |
|
852 +{ |
|
853 + *(ib_net32_t *)&(_swigobj->port_guid) = *((ib_net32_t *)swigval); |
|
854 + *((ib_net32_t *)&(_swigobj->port_guid) + 1) = *((ib_net32_t *)swigval +1); |
|
855 + return ((ib_net64_t *)swigval); |
|
856 +} |
|
857 +#else |
|
858 #define _ibsm_node_info_port_guid_set(_swigobj,_swigval) (_swigobj->port_guid = *(_swigval),_swigval) |
|
859 +#endif |
|
860 static int _wrap_smNodeInfo_port_guid_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
861 |
|
862 ib_net64_t * _result; |
|
863 @@ -35458,7 +35511,17 @@ |
|
864 } |
|
865 return TCL_OK; |
|
866 } |
|
867 +#ifdef __sparc |
|
868 +#define _ibsm_node_info_port_guid_get(_swigobj) _ibsm_node_info_port_guid_get_64(_swigobj) |
|
869 +static inline ib_net64_t * _ibsm_node_info_port_guid_get_64(smNodeInfo *_swigobj){ |
|
870 + static uint32_t val[2]; |
|
871 + val[0] = *(ib_net32_t *)&(_swigobj->port_guid); |
|
872 + val[1] = *((ib_net32_t *)&(_swigobj->port_guid) + 1); |
|
873 + return ((ib_net64_t *)&val); |
|
874 +} |
|
875 +#else |
|
876 #define _ibsm_node_info_port_guid_get(_swigobj) (&_swigobj->port_guid) |
|
877 +#endif |
|
878 static int _wrap_smNodeInfo_port_guid_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
879 |
|
880 ib_net64_t * _result; |
999 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h ibutils-1.5.7/ibis/src/ibpm_base.h |
881 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h ibutils-1.5.7/ibis/src/ibpm_base.h |
1000 --- /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h Wed Feb 24 02:09:25 2010 |
882 --- /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h Wed Feb 24 02:09:25 2010 |
1001 +++ ibutils-1.5.7/ibis/src/ibpm_base.h Thu Feb 24 16:51:18 2011 |
883 +++ ibutils-1.5.7/ibis/src/ibpm_base.h Thu Feb 24 16:51:18 2011 |
1002 @@ -34,7 +34,11 @@ |
884 @@ -34,7 +34,11 @@ |
1003 #ifndef _IBPM_BASE_H_ |
885 #ifndef _IBPM_BASE_H_ |
1095 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned)); |
977 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned)); |
1096 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned)); |
978 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned)); |
1097 |
979 |
1098 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */ |
980 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */ |
1099 |
981 |
|
982 @@ -35242,7 +35251,18 @@ |
|
983 } |
|
984 return TCL_OK; |
|
985 } |
|
986 +#ifdef __sparc |
|
987 +#define _ibsm_node_info_sys_guid_set(_swigobj,_swigval) _ibsm_node_info_sys_guid_set_64(_swigobj, _swigval) |
|
988 +static inline ib_net64_t * |
|
989 +_ibsm_node_info_sys_guid_set_64(smNodeInfo *_swigobj, ib_net64_t *swigval) |
|
990 +{ |
|
991 + *(ib_net32_t *)&(_swigobj->sys_guid) = *((ib_net32_t *)swigval); |
|
992 + *((ib_net32_t *)&(_swigobj->sys_guid) + 1) = *((ib_net32_t *)swigval +1); |
|
993 + return ((ib_net64_t *)swigval); |
|
994 +} |
|
995 +#else |
|
996 #define _ibsm_node_info_sys_guid_set(_swigobj,_swigval) (_swigobj->sys_guid = *(_swigval),_swigval) |
|
997 +#endif |
|
998 static int _wrap_smNodeInfo_sys_guid_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
999 |
|
1000 ib_net64_t * _result; |
|
1001 @@ -35300,7 +35320,18 @@ |
|
1002 } |
|
1003 return TCL_OK; |
|
1004 } |
|
1005 + |
|
1006 +#ifdef __sparc |
|
1007 +#define _ibsm_node_info_sys_guid_get(_swigobj) _ibsm_node_info_sys_guid_get_64(_swigobj) |
|
1008 +static inline ib_net64_t * _ibsm_node_info_sys_guid_get_64(smNodeInfo *_swigobj){ |
|
1009 + static uint32_t val[2]; |
|
1010 + val[0] = *(ib_net32_t *)&(_swigobj->sys_guid); |
|
1011 + val[1] = *((ib_net32_t *)&(_swigobj->sys_guid) + 1); |
|
1012 + return ((ib_net64_t *)&val); |
|
1013 +} |
|
1014 +#else |
|
1015 #define _ibsm_node_info_sys_guid_get(_swigobj) (&_swigobj->sys_guid) |
|
1016 +#endif |
|
1017 static int _wrap_smNodeInfo_sys_guid_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
1018 |
|
1019 ib_net64_t * _result; |
|
1020 @@ -35340,6 +35371,7 @@ |
|
1021 ibis_tcl_error = 0; |
|
1022 _result = (ib_net64_t *)_ibsm_node_info_sys_guid_get(_arg0); |
|
1023 ; |
|
1024 + |
|
1025 if (ibis_tcl_error) { |
|
1026 Tcl_SetStringObj(Tcl_GetObjResult(interp), ibis_tcl_error_msg, -1); |
|
1027 return TCL_ERROR; |
|
1028 @@ -35352,7 +35384,18 @@ |
|
1029 } |
|
1030 return TCL_OK; |
|
1031 } |
|
1032 +#ifdef __sparc |
|
1033 +#define _ibsm_node_info_node_guid_set(_swigobj,_swigval) _ibsm_node_info_node_guid_set_64(_swigobj, _swigval) |
|
1034 +static inline ib_net64_t * |
|
1035 +_ibsm_node_info_node_guid_set_64(smNodeInfo *_swigobj, ib_net64_t *swigval) |
|
1036 +{ |
|
1037 + *(ib_net32_t *)&(_swigobj->node_guid) = *((ib_net32_t *)swigval); |
|
1038 + *((ib_net32_t *)&(_swigobj->node_guid) + 1) = *((ib_net32_t *)swigval +1); |
|
1039 + return ((ib_net64_t *)swigval); |
|
1040 +} |
|
1041 +#else |
|
1042 #define _ibsm_node_info_node_guid_set(_swigobj,_swigval) (_swigobj->node_guid = *(_swigval),_swigval) |
|
1043 +#endif |
|
1044 static int _wrap_smNodeInfo_node_guid_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
1045 |
|
1046 ib_net64_t * _result; |
|
1047 @@ -35410,7 +35453,17 @@ |
|
1048 } |
|
1049 return TCL_OK; |
|
1050 } |
|
1051 +#ifdef __sparc |
|
1052 +#define _ibsm_node_info_node_guid_get(_swigobj) _ibsm_node_info_node_guid_get_64(_swigobj) |
|
1053 +static inline ib_net64_t * _ibsm_node_info_node_guid_get_64(smNodeInfo *_swigobj){ |
|
1054 + static uint32_t val[2]; |
|
1055 + val[0] = *(ib_net32_t *)&(_swigobj->node_guid); |
|
1056 + val[1] = *((ib_net32_t *)&(_swigobj->node_guid) + 1); |
|
1057 + return ((ib_net64_t *)&val); |
|
1058 +} |
|
1059 +#else |
|
1060 #define _ibsm_node_info_node_guid_get(_swigobj) (&_swigobj->node_guid) |
|
1061 +#endif |
|
1062 static int _wrap_smNodeInfo_node_guid_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
1063 |
|
1064 ib_net64_t * _result; |
|
1065 @@ -35462,7 +35515,18 @@ |
|
1066 } |
|
1067 return TCL_OK; |
|
1068 } |
|
1069 +#ifdef __sparc |
|
1070 +#define _ibsm_node_info_port_guid_set(_swigobj,_swigval) _ibsm_node_info_port_guid_set_64(_swigobj, _swigval) |
|
1071 +static inline ib_net64_t * |
|
1072 +_ibsm_node_info_port_guid_set_64(smNodeInfo *_swigobj, ib_net64_t *swigval) |
|
1073 +{ |
|
1074 + *(ib_net32_t *)&(_swigobj->port_guid) = *((ib_net32_t *)swigval); |
|
1075 + *((ib_net32_t *)&(_swigobj->port_guid) + 1) = *((ib_net32_t *)swigval +1); |
|
1076 + return ((ib_net64_t *)swigval); |
|
1077 +} |
|
1078 +#else |
|
1079 #define _ibsm_node_info_port_guid_set(_swigobj,_swigval) (_swigobj->port_guid = *(_swigval),_swigval) |
|
1080 +#endif |
|
1081 static int _wrap_smNodeInfo_port_guid_set(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
1082 |
|
1083 ib_net64_t * _result; |
|
1084 @@ -35520,7 +35584,17 @@ |
|
1085 } |
|
1086 return TCL_OK; |
|
1087 } |
|
1088 +#ifdef __sparc |
|
1089 +#define _ibsm_node_info_port_guid_get(_swigobj) _ibsm_node_info_port_guid_get_64(_swigobj) |
|
1090 +static inline ib_net64_t * _ibsm_node_info_port_guid_get_64(smNodeInfo *_swigobj){ |
|
1091 + static uint32_t val[2]; |
|
1092 + val[0] = *(ib_net32_t *)&(_swigobj->port_guid); |
|
1093 + val[1] = *((ib_net32_t *)&(_swigobj->port_guid) + 1); |
|
1094 + return ((ib_net64_t *)&val); |
|
1095 +} |
|
1096 +#else |
|
1097 #define _ibsm_node_info_port_guid_get(_swigobj) (&_swigobj->port_guid) |
|
1098 +#endif |
|
1099 static int _wrap_smNodeInfo_port_guid_get(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { |
|
1100 |
|
1101 ib_net64_t * _result; |
1100 diff -r -u /tmp/ibutils-1.5.7/ibis/tests/Makefile.in ibutils-1.5.7/ibis/tests/Makefile.in |
1102 diff -r -u /tmp/ibutils-1.5.7/ibis/tests/Makefile.in ibutils-1.5.7/ibis/tests/Makefile.in |
1101 --- /tmp/ibutils-1.5.7/ibis/tests/Makefile.in Tue Mar 8 03:09:51 2011 |
1103 --- /tmp/ibutils-1.5.7/ibis/tests/Makefile.in Tue Mar 8 03:09:51 2011 |
1102 +++ ibutils-1.5.7/ibis/tests/Makefile.in Thu Feb 24 16:51:18 2011 |
1104 +++ ibutils-1.5.7/ibis/tests/Makefile.in Thu Feb 24 16:51:18 2011 |
1103 @@ -53,7 +53,7 @@ |
1105 @@ -53,7 +53,7 @@ |
1104 pkglibdir = $(libdir)/@PACKAGE@ |
1106 pkglibdir = $(libdir)/@PACKAGE@ |
1156 esac |
1158 esac |
1157 + hardcode_libdir_flag_spec_CXX= |
1159 + hardcode_libdir_flag_spec_CXX= |
1158 ;; |
1160 ;; |
1159 |
1161 |
1160 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
1162 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
1161 @@ -15295,7 +15297,8 @@ |
1163 @@ -15284,8 +15286,8 @@ |
|
1164 else |
|
1165 osm_lib_dir=lib |
|
1166 fi |
|
1167 + with_osm_libs=$with_osm/$osm_lib_dir |
|
1168 fi |
|
1169 - with_osm_libs=$with_osm/$osm_lib_dir |
|
1170 |
|
1171 if test -d $with_osm/include/infiniband; then |
|
1172 OSM_BUILD=openib |
|
1173 @@ -15295,7 +15297,7 @@ |
1162 { $as_echo "$as_me:${as_lineno-$LINENO}: OSM: build type $OSM_BUILD" >&5 |
1174 { $as_echo "$as_me:${as_lineno-$LINENO}: OSM: build type $OSM_BUILD" >&5 |
1163 $as_echo "$as_me: OSM: build type $OSM_BUILD" >&6;} |
1175 $as_echo "$as_me: OSM: build type $OSM_BUILD" >&6;} |
1164 |
1176 |
1165 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs" |
1177 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs" |
1166 + with_osm_libs=`echo "$with_osm_libs" | $SED -e "s/\/lib64$/\/lib/g"` |
|
1167 + OSM_LDFLAGS="-L$with_osm_libs" |
1178 + OSM_LDFLAGS="-L$with_osm_libs" |
1168 if test $OSM_BUILD = openib; then |
1179 if test $OSM_BUILD = openib; then |
1169 osm_include_dir="$with_osm/include/infiniband" |
1180 osm_include_dir="$with_osm/include/infiniband" |
1170 osm_extra_includes="-I$with_osm/include" |
1181 osm_extra_includes="-I$with_osm/include" |
1171 @@ -15378,7 +15381,7 @@ |
1182 @@ -15378,7 +15380,7 @@ |
1172 osm_debug_flags= |
1183 osm_debug_flags= |
1173 fi |
1184 fi |
1174 |
1185 |
1175 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
1186 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
1176 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
1187 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
1211 -install_sh_DATA = $(install_sh) -c -m 644 |
1222 -install_sh_DATA = $(install_sh) -c -m 644 |
1212 +install_sh_DATA = $(install_sh) -c -m 744 |
1223 +install_sh_DATA = $(install_sh) -c -m 744 |
1213 install_sh_PROGRAM = $(install_sh) -c |
1224 install_sh_PROGRAM = $(install_sh) -c |
1214 install_sh_SCRIPT = $(install_sh) -c |
1225 install_sh_SCRIPT = $(install_sh) -c |
1215 INSTALL_HEADER = $(INSTALL_DATA) |
1226 INSTALL_HEADER = $(INSTALL_DATA) |
1216 @@ -103,7 +103,7 @@ |
|
1217 am__base_list = \ |
|
1218 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
1219 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
1220 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
|
1221 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \ |
|
1222 "$(DESTDIR)$(pkgincludedir)" |
|
1223 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
1224 libibmscli_la_LIBADD = |
|
1225 @@ -430,8 +430,8 @@ |
|
1226 $(libibmscli_la_LINK) -rpath $(libdir) $(libibmscli_la_OBJECTS) $(libibmscli_la_LIBADD) $(LIBS) |
|
1227 install-binPROGRAMS: $(bin_PROGRAMS) |
|
1228 @$(NORMAL_INSTALL) |
|
1229 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
1230 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
1231 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
1232 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
1233 for p in $$list; do echo "$$p $$p"; done | \ |
|
1234 sed 's/$(EXEEXT)$$//' | \ |
|
1235 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
1236 @@ -455,13 +455,13 @@ |
|
1237 |
|
1238 uninstall-binPROGRAMS: |
|
1239 @$(NORMAL_UNINSTALL) |
|
1240 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
1241 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
1242 files=`for p in $$list; do echo "$$p"; done | \ |
|
1243 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
1244 -e 's/$$/$(EXEEXT)/' `; \ |
|
1245 test -n "$$list" || exit 0; \ |
|
1246 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
1247 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
1248 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
1249 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
1250 |
|
1251 clean-binPROGRAMS: |
|
1252 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
1253 @@ -693,7 +693,7 @@ |
|
1254 install-binPROGRAMS: install-libLTLIBRARIES |
|
1255 |
|
1256 installdirs: |
|
1257 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
1258 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
1259 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
1260 done |
|
1261 install: install-am |
|
1262 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in ibutils-1.5.7/ibmgtsim/tests/Makefile.in |
1227 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in ibutils-1.5.7/ibmgtsim/tests/Makefile.in |
1263 --- /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in Tue Mar 8 03:10:01 2011 |
1228 --- /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in Tue Mar 8 03:10:01 2011 |
1264 +++ ibutils-1.5.7/ibmgtsim/tests/Makefile.in Thu Feb 24 16:51:19 2011 |
1229 +++ ibutils-1.5.7/ibmgtsim/tests/Makefile.in Thu Feb 24 16:51:19 2011 |
1265 @@ -53,7 +53,7 @@ |
1230 @@ -53,7 +53,7 @@ |
1266 pkglibdir = $(libdir)/@PACKAGE@ |
1231 pkglibdir = $(libdir)/@PACKAGE@ |
1281 -install_sh_DATA = $(install_sh) -c -m 644 |
1246 -install_sh_DATA = $(install_sh) -c -m 644 |
1282 +install_sh_DATA = $(install_sh) -c -m 744 |
1247 +install_sh_DATA = $(install_sh) -c -m 744 |
1283 install_sh_PROGRAM = $(install_sh) -c |
1248 install_sh_PROGRAM = $(install_sh) -c |
1284 install_sh_SCRIPT = $(install_sh) -c |
1249 install_sh_SCRIPT = $(install_sh) -c |
1285 INSTALL_HEADER = $(INSTALL_DATA) |
1250 INSTALL_HEADER = $(INSTALL_DATA) |
1286 @@ -99,7 +99,7 @@ |
|
1287 am__base_list = \ |
|
1288 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
1289 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
1290 -am__installdirs = "$(DESTDIR)$(bindir)" |
|
1291 +am__installdirs = "$(DESTDIR)$(sbindir)" |
|
1292 SCRIPTS = $(bin_SCRIPTS) |
|
1293 SOURCES = |
|
1294 DIST_SOURCES = |
|
1295 @@ -275,8 +275,8 @@ |
|
1296 $(am__aclocal_m4_deps): |
|
1297 install-binSCRIPTS: $(bin_SCRIPTS) |
|
1298 @$(NORMAL_INSTALL) |
|
1299 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
1300 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
|
1301 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
1302 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ |
|
1303 for p in $$list; do \ |
|
1304 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
1305 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
|
1306 @@ -294,19 +294,19 @@ |
|
1307 while read type dir files; do \ |
|
1308 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
1309 test -z "$$files" || { \ |
|
1310 - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
1311 - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
1312 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
1313 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
1314 } \ |
|
1315 ; done |
|
1316 |
|
1317 uninstall-binSCRIPTS: |
|
1318 @$(NORMAL_UNINSTALL) |
|
1319 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ |
|
1320 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ |
|
1321 files=`for p in $$list; do echo "$$p"; done | \ |
|
1322 sed -e 's,.*/,,;$(transform)'`; \ |
|
1323 test -n "$$list" || exit 0; \ |
|
1324 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
1325 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
1326 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
1327 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
1328 |
|
1329 mostlyclean-libtool: |
|
1330 -rm -f *.lo |
|
1331 @@ -354,7 +354,7 @@ |
|
1332 check: check-am |
|
1333 all-am: Makefile $(SCRIPTS) |
|
1334 installdirs: |
|
1335 - for dir in "$(DESTDIR)$(bindir)"; do \ |
|
1336 + for dir in "$(DESTDIR)$(sbindir)"; do \ |
|
1337 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
1338 done |
|
1339 install: install-am |
|
1340 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in ibutils-1.5.7/ibmgtsim/Makefile.in |
1251 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in ibutils-1.5.7/ibmgtsim/Makefile.in |
1341 --- /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in Tue Mar 8 03:10:02 2011 |
1252 --- /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in Tue Mar 8 03:10:02 2011 |
1342 +++ ibutils-1.5.7/ibmgtsim/Makefile.in Thu Feb 24 16:51:18 2011 |
1253 +++ ibutils-1.5.7/ibmgtsim/Makefile.in Thu Feb 24 16:51:18 2011 |
1343 @@ -54,7 +54,7 @@ |
1254 @@ -54,7 +54,7 @@ |
1344 pkglibdir = $(libdir)/@PACKAGE@ |
1255 pkglibdir = $(libdir)/@PACKAGE@ |