List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:August 20 2009 8:09pm
Subject:bzr push into mysql-5.0 branch (joerg:2786 to 2787) Bug#37098
View as plain text  
 2787 Joerg Bruehe	2009-08-20 [merge]
      Merge the correction for the bug#37098 fix into 5.0-build

    modified:
      man/Makefile.am
 2786 Joerg Bruehe	2009-08-11 [merge]
      Merge main 5.0 with 5.0-build,
      automerge didn't handle this correctly,
      so test "view" was corrected manually.

=== modified file 'man/Makefile.am'
--- a/man/Makefile.am	2008-08-25 19:07:41 +0000
+++ b/man/Makefile.am	2009-08-20 19:08:09 +0000
@@ -24,8 +24,8 @@ EXTRA_DIST =  $(man1_MANS) $(man8_MANS)
 # 1) not needed in Unix binary packages,
 # 2) programs not generated in 5.0:
 install-data-hook:
-	rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*
-	rm -f $(DESTDIR)$(manlibdir)/man1/ndb_print_*
+	rm -f $(DESTDIR)$(mandir)/man1/make_win_*
+	rm -f $(DESTDIR)$(mandir)/man1/ndb_print_*
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%


Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20090820200740-cffxigf492lgo4m2.bundle
Thread
bzr push into mysql-5.0 branch (joerg:2786 to 2787) Bug#37098Joerg Bruehe20 Aug