[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 Makefile.am           |    3 ---
 libparted/Makefile.am |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 6f41bd7249cf7ac4635c5957f8a2d9804970edea
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Jul 22 23:37:45 2009 +0200

    build: avoid "make dist-hook" failure
    
    * Makefile.am (dist-hook): Remove coreutils-specific rm-substitution.

diff --git a/Makefile.am b/Makefile.am
index 2cebc14..1931bf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,11 +78,8 @@ MAINTAINERCLEANFILES += \
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
-# The perl substitution is to change some key uses of "rm" to "/bin/rm".
-# See the rm_subst comment for details.
 dist-hook: gen-ChangeLog
 	echo $(VERSION) > $(distdir)/.tarball-version
-	perl -pi -e '$(rm_subst)' $(distdir)/src/Makefile.in
 
 gen_start_date = 2000-01-01
 .PHONY: gen-ChangeLog

commit 7a8b9ab3da68edc0cdf59608bba76dc55b5d2a3d
Author: Jim Meyering <meyering at redhat.com>
Date:   Wed Jul 22 20:18:52 2009 +0200

    build: avoid automake warning
    
    * libparted/Makefile.am (SUBDIRS_CHECK): Do not redefine.
    Instead, append to existing value.

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 0ed01bb..71f71c9 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS_CHECK =
 if HAVE_CHECK
-SUBDIRS_CHECK = tests
+SUBDIRS_CHECK += tests
 endif
 
 ARCH_SOURCE = arch/$(OS).c