uuid/makefile.patch

   1 diff -Naur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in
   2 --- uuid-1.6.2.orig/Makefile.in 2010-12-21 08:27:31.550117859 -0700
   3 +++ uuid-1.6.2/Makefile.in      2010-12-21 08:50:36.578086743 -0700
   4 @@ -62,13 +62,13 @@
   5  PHP         = @PHP@
   6  PG_CONFIG   = @PG_CONFIG@
   7
   8 -LIB_NAME    = libuuid.la
   9 +LIB_NAME    = libossp-uuid.la
  10  LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
  11
  12 -DCE_NAME    = libuuid_dce.la
  13 +DCE_NAME    = libossp-uuid_dce.la
  14  DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
  15
  16 -CXX_NAME    = libuuid++.la
  17 +CXX_NAME    = libossp-uuid++.la
  18  CXX_OBJS    = uuid++.lo $(LIB_OBJS)
  19
  20  PRG_NAME    = uuid
  21 @@ -231,7 +231,7 @@
  22         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
  23         $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
  24         $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
  25 -       $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
  26 +       $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
  27         $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
  28         -@if [ ".$(WITH_DCE)" = .yes ]; then \
  29             echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
  30 @@ -241,7 +241,7 @@
  31             echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
  32             $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
  33         fi
  34 -       $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
  35 +       $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
  36         -@if [ ".$(WITH_CXX)" = .yes ]; then \
  37             echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
  38             $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
  39 @@ -276,7 +276,7 @@
  40         -@if [ ".$(WITH_CXX)" = .yes ]; then \
  41             $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
  42         fi
  43 -       -$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
  44 +       -$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
  45         -@if [ ".$(WITH_CXX)" = .yes ]; then \
  46             echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
  47             $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
  48 @@ -290,7 +290,7 @@
  49             echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
  50             $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
  51         fi
  52 -       -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
  53 +       -$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
  54         -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
  55         -$(RM) $(DESTDIR)$(bindir)/uuid-config
  56         -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
  57 diff --git a/perl/Makefile.PL b/perl/Makefile.PL
  58 index 92f4494..9c6fee6 100644
  59 --- a/perl/Makefile.PL
  60 +++ b/perl/Makefile.PL
  61 @@ -33,9 +33,9 @@ use Config;
  62  use ExtUtils::MakeMaker;
  63
  64  #   determine source directory
  65 -my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
  66 -               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
  67 -    or die "no source directory found (where libuuid.la is located)";
  68 +my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
  69 +               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
  70 +    or die "no source directory found (where libossp-uuid.la is located)";
  71
  72  #   determine extra build options
  73  my $compat = 0;
  74 @@ -47,15 +47,15 @@ WriteMakefile(
  75      VERSION_FROM      => 'uuid.pm',
  76      ABSTRACT_FROM     => 'uuid.pod',
  77      PREREQ_PM         => {},
  78 -    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
  79 +    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
  80      DEFINE            => '',
  81      INC               => "-I. -I$srcdir",
  82      PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
  83                             'uuid.pod'  => '$(INST_LIBDIR)/uuid.pod',
  84                             ($compat ? ('uuid_compat.pm'  => '$(INST_LIBDIR)/../Data/UUID.pm')  : ()),
  85                             ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), },
  86 -    MAN3PODS          => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3',
  87 -                           ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), },
  88 +    MAN3PODS          => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm',
  89 +                           ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), },
  90      TYPEMAPS          => [ 'uuid.tm' ],
  91      test              => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') },
  92      NO_META           => 1,
  93 diff -Naur uuid-1.6.2.orig/uuid-config.in uuid-1.6.2/uuid-config.in
  94 --- uuid-1.6.2.orig/uuid-config.in      2010-12-21 08:27:31.546784588 -0700
  95 +++ uuid-1.6.2/uuid-config.in   2010-12-21 08:48:38.170684057 -0700
  96 @@ -121,7 +121,7 @@
  97              output_extra="$output_extra $uuid_ldflags"
  98              ;;
  99          --libs)
 100 -            output="$output -luuid"
 101 +            output="$output -lossp-uuid"
 102              output_extra="$output_extra $uuid_libs"
 103              ;;
 104          * )
 105 diff -Naur uuid-1.6.2.orig/uuid.pc.in uuid-1.6.2/uuid.pc.in
 106 --- uuid-1.6.2.orig/uuid.pc.in  2010-12-21 08:27:31.546784588 -0700
 107 +++ uuid-1.6.2/uuid.pc.in       2010-12-21 08:48:38.174017223 -0700
 108 @@ -37,6 +37,6 @@
 109  Version: @UUID_VERSION_RAW@
 110  URL: http://www.ossp.org/pkg/lib/uuid/
 111  Cflags: -I${includedir}
 112 -Libs: -L${libdir} -luuid
 113 +Libs: -L${libdir} -lossp-uuid
 114  Libs.private: @LIBS@