Index: ossp-pkg/uuid/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v
rcsdiff -q -kk '-r1.128' '-r1.129' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v' 2>/dev/null
--- ChangeLog	2006/07/31 12:02:56	1.128
+++ ChangeLog	2006/07/31 12:22:15	1.129
@@ -13,6 +13,11 @@
 
   Changes between 1.5.0 and 1.5.1 (28-Jul-2006 to 31-Jul-2006)
 
+   o Use the available variables $(LIB_NAME), $(DCE_NAME) and
+     $(CXX_NAME) more consistently in Makefile.in to allow packagers to
+     override the library name with less patching.
+     [Piotr Roszatycki <dexter@debian.org>]
+
    o Fix the "make distclean" target of php/Makefile.local
      to make sure the ".deps" file is not left over.
      [Ralf S. Engelschall]
Index: ossp-pkg/uuid/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/Makefile.in,v
rcsdiff -q -kk '-r1.41' '-r1.42' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/Makefile.in,v' 2>/dev/null
--- Makefile.in	2006/05/11 09:37:27	1.41
+++ Makefile.in	2006/07/31 12:22:15	1.42
@@ -245,12 +245,12 @@
 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
 	fi
-	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid.la $(DESTDIR)$(libdir)/
+	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
-	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid_dce.la $(DESTDIR)$(libdir)/; \
+	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(DCE_NAME) $(DESTDIR)$(libdir)/; \
 	fi
 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
-	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid++.la $(DESTDIR)$(libdir)/; \
+	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \
 	fi
 	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
@@ -268,12 +268,12 @@
 uninstall:
 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid.1
 	-@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(bindir)/uuid
-	-@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid.la
+	-@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIB_NAME)
 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
-	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid_dce.la; \
+	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(DCE_NAME); \
 	fi
 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
-	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid++.la; \
+	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(CXX_NAME); \
 	fi
 	-$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
 	-@if [ ".$(WITH_CXX)" = .yes ]; then \