Package: dh-make
Version: 0.42
Severity: minor
Tags: patch
dh_make's generated rules file copies the config.{sub,guess} files from
/usr/share/misc (provided by the autotools-dev package) into the build
tree in the 'clean' target. Thus, the .diff.gz will contain
config.{sub,guess} files that are already on the system, since the
package will Build-Depend on autotools-dev.
The included patch moves the copy into the 'config.status' target, and
adds commands to remove those files into the 'clean' target. In the
case that the config.{sub,guess} files are included with the original
source, dpkg-source simply ignores the removal when generating the
.diff.gz.
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (1000, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17-1-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages dh-make depends on:
ii debhelper 5.0.40 helper programs for debian/rules
ii dpkg-dev 1.13.22 package building tools for Debian
ii make 3.81-3 The GNU version of the "make" util
ii perl 5.8.8-6.1 Larry Wall's Practical Extraction
dh-make recommends no packages.
-- no debconf information
diff -Nur dh-make-0.42.debian/dh_make dh-make-0.42/dh_make
--- dh-make-0.42.debian/dh_make 2006-10-29 20:16:02.000000000 -0700
+++ dh-make-0.42/dh_make 2007-01-05 17:25:35.000000000 -0700
@@ -486,6 +486,12 @@
$CONFIGURE="config.status: configure\n".
"\tdh_testdir\n".
"\t# Add here commands to configure the package.\n".
+ "ifneq \"\$(wildcard /usr/share/misc/config.sub)\"
\"\"\n".
+ "\tcp -f /usr/share/misc/config.sub config.sub\n".
+ "endif\n".
+ "ifneq \"\$(wildcard /usr/share/misc/config.guess)\"
\"\"\n".
+ "\tcp -f /usr/share/misc/config.guess config.guess\n".
+ "endif\n".
"\t".'./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"'."\n";
$DPKG_ARCH="# These are used for cross-compiling and for saving the
configure script\n".
"# from having to guess our platform (since we know it
already)\n".
@@ -509,12 +515,7 @@
}
}
$CLEAN="\$(MAKE) distclean\n".
- "ifneq \"\$(wildcard /usr/share/misc/config.sub)\" \"\"\n".
- "\tcp -f /usr/share/misc/config.sub config.sub\n".
- "endif\n".
- "ifneq \"\$(wildcard /usr/share/misc/config.guess)\" \"\"\n".
- "\tcp -f /usr/share/misc/config.guess config.guess\n".
- "endif\n";
+ "\trm -f config.sub config.guess";
$BUILD_DEPS .= ', autotools-dev';
} else {
if (! -f 'Makefile' && ! -f 'makefile' && ! -f 'GNUmakefile')
